changeset 2888:1609660fb832

Fix all paths to reference openjdk. 2013-04-17 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch, * patches/openjdk/jaxp144_05.patch: Fix all paths to reference openjdk tree.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Wed, 17 Apr 2013 11:44:19 +0100
parents 82e17c1cd647
children f25e5db93976
files ChangeLog patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch patches/openjdk/jaxp144_05.patch
diffstat 3 files changed, 4657 insertions(+), 4651 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Apr 17 11:26:25 2013 +0100
+++ b/ChangeLog	Wed Apr 17 11:44:19 2013 +0100
@@ -1,3 +1,9 @@
+2013-04-17  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch,
+	* patches/openjdk/jaxp144_05.patch:
+	Fix all paths to reference openjdk tree.
+
 2013-04-17  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* Makefile.am:
--- a/patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch	Wed Apr 17 11:26:25 2013 +0100
+++ b/patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch	Wed Apr 17 11:44:19 2013 +0100
@@ -5,7 +5,7 @@
 # Parent  5c734e43475dca2ace97e0ac0dcfbed477c22825
 Add contents of jdk6-jaf-b20.zip and jdk6-jaxws2_1_6-2011_06_13.zip
 
-diff --git a/drop_included/jaf_src/LICENSE b/drop_included/jaf_src/LICENSE
+diff --git a/drop_included/jaf_src/LICENSE openjdk/jaxws/drop_included/jaf_src/LICENSE
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/LICENSE
@@ -357,7 +357,7 @@
 +    you modify this library, you may extend this exception to your version of
 +    the library, but you are not obligated to do so.  If you do not wish to do
 +    so, delete this exception statement from your version.
-diff --git a/drop_included/jaf_src/src/META-INF/mailcap.default b/drop_included/jaf_src/src/META-INF/mailcap.default
+diff --git a/drop_included/jaf_src/src/META-INF/mailcap.default openjdk/jaxws/drop_included/jaf_src/src/META-INF/mailcap.default
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/META-INF/mailcap.default
@@ -369,7 +369,7 @@
 +image/jpeg;;		x-java-view=com.sun.activation.viewers.ImageViewer
 +text/*;;		x-java-view=com.sun.activation.viewers.TextViewer
 +text/*;;		x-java-edit=com.sun.activation.viewers.TextEditor
-diff --git a/drop_included/jaf_src/src/META-INF/mimetypes.default b/drop_included/jaf_src/src/META-INF/mimetypes.default
+diff --git a/drop_included/jaf_src/src/META-INF/mimetypes.default openjdk/jaxws/drop_included/jaf_src/src/META-INF/mimetypes.default
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/META-INF/mimetypes.default
@@ -398,7 +398,7 @@
 +video/mpeg		mpeg mpg mpe
 +video/quicktime		qt mov
 +video/x-msvideo		avi
-diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/LogSupport.java b/drop_included/jaf_src/src/com/sun/activation/registries/LogSupport.java
+diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/LogSupport.java openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/LogSupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/LogSupport.java
@@ -473,7 +473,7 @@
 +        return debug || logger.isLoggable(level);
 +    }
 +}
-diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MailcapFile.java b/drop_included/jaf_src/src/com/sun/activation/registries/MailcapFile.java
+diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MailcapFile.java openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MailcapFile.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MailcapFile.java
@@ -1041,7 +1041,7 @@
 +    }
 +    */
 +}
-diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MailcapParseException.java b/drop_included/jaf_src/src/com/sun/activation/registries/MailcapParseException.java
+diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MailcapParseException.java openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MailcapParseException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MailcapParseException.java
@@ -1086,7 +1086,7 @@
 +        super(inInfo);
 +    }
 +}
-diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MailcapTokenizer.java b/drop_included/jaf_src/src/com/sun/activation/registries/MailcapTokenizer.java
+diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MailcapTokenizer.java openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MailcapTokenizer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MailcapTokenizer.java
@@ -1412,7 +1412,7 @@
 +    }
 +    */
 +}
-diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeEntry.java b/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeEntry.java
+diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeEntry.java openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeEntry.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeEntry.java
@@ -1467,7 +1467,7 @@
 +        return "MIMETypeEntry: " + type + ", " + extension;
 +    }
 +}
-diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeFile.java b/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeFile.java
+diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeFile.java openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeFile.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeFile.java
@@ -1789,7 +1789,7 @@
 +        stack.addElement(token);
 +    }
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/ActivationDataFlavor.java b/drop_included/jaf_src/src/javax/activation/ActivationDataFlavor.java
+diff --git a/drop_included/jaf_src/src/javax/activation/ActivationDataFlavor.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/ActivationDataFlavor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/ActivationDataFlavor.java
@@ -2044,7 +2044,7 @@
 +        return mimeType;
 +    }
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/CommandInfo.java b/drop_included/jaf_src/src/javax/activation/CommandInfo.java
+diff --git a/drop_included/jaf_src/src/javax/activation/CommandInfo.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/CommandInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/CommandInfo.java
@@ -2187,7 +2187,7 @@
 +        return new_bean;
 +    }
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/CommandMap.java b/drop_included/jaf_src/src/javax/activation/CommandMap.java
+diff --git a/drop_included/jaf_src/src/javax/activation/CommandMap.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/CommandMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/CommandMap.java
@@ -2412,7 +2412,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/CommandObject.java b/drop_included/jaf_src/src/javax/activation/CommandObject.java
+diff --git a/drop_included/jaf_src/src/javax/activation/CommandObject.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/CommandObject.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/CommandObject.java
@@ -2471,7 +2471,7 @@
 +    public void setCommandContext(String verb, DataHandler dh)
 +                                                throws IOException;
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/DataContentHandler.java b/drop_included/jaf_src/src/javax/activation/DataContentHandler.java
+diff --git a/drop_included/jaf_src/src/javax/activation/DataContentHandler.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataContentHandler.java
@@ -2577,7 +2577,7 @@
 +    public void writeTo(Object obj, String mimeType, OutputStream os)
 +                                                       throws IOException;
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/DataContentHandlerFactory.java b/drop_included/jaf_src/src/javax/activation/DataContentHandlerFactory.java
+diff --git a/drop_included/jaf_src/src/javax/activation/DataContentHandlerFactory.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataContentHandlerFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataContentHandlerFactory.java
@@ -2630,7 +2630,7 @@
 +     */
 +    public DataContentHandler createDataContentHandler(String mimeType);
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/DataHandler.java b/drop_included/jaf_src/src/javax/activation/DataHandler.java
+diff --git a/drop_included/jaf_src/src/javax/activation/DataHandler.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataHandler.java
@@ -3529,7 +3529,7 @@
 +                "no object DCH for MIME type " + this.mimeType);
 +    }
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/DataSource.java b/drop_included/jaf_src/src/javax/activation/DataSource.java
+diff --git a/drop_included/jaf_src/src/javax/activation/DataSource.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataSource.java
@@ -3620,7 +3620,7 @@
 +     */
 +    public String getName();
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/FileDataSource.java b/drop_included/jaf_src/src/javax/activation/FileDataSource.java
+diff --git a/drop_included/jaf_src/src/javax/activation/FileDataSource.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/FileDataSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/FileDataSource.java
@@ -3783,7 +3783,7 @@
 +        typeMap = map;
 +    }
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/FileTypeMap.java b/drop_included/jaf_src/src/javax/activation/FileTypeMap.java
+diff --git a/drop_included/jaf_src/src/javax/activation/FileTypeMap.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/FileTypeMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/FileTypeMap.java
@@ -3906,7 +3906,7 @@
 +        return defaultMap;
 +    }
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/MailcapCommandMap.java b/drop_included/jaf_src/src/javax/activation/MailcapCommandMap.java
+diff --git a/drop_included/jaf_src/src/javax/activation/MailcapCommandMap.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MailcapCommandMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MailcapCommandMap.java
@@ -4612,7 +4612,7 @@
 +    }
 +    */
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/MimeType.java b/drop_included/jaf_src/src/javax/activation/MimeType.java
+diff --git a/drop_included/jaf_src/src/javax/activation/MimeType.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimeType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimeType.java
@@ -4961,7 +4961,7 @@
 +    }
 +    */
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/MimeTypeParameterList.java b/drop_included/jaf_src/src/javax/activation/MimeTypeParameterList.java
+diff --git a/drop_included/jaf_src/src/javax/activation/MimeTypeParameterList.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimeTypeParameterList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimeTypeParameterList.java
@@ -5305,7 +5305,7 @@
 +        return buffer.toString();
 +    }
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/MimeTypeParseException.java b/drop_included/jaf_src/src/javax/activation/MimeTypeParseException.java
+diff --git a/drop_included/jaf_src/src/javax/activation/MimeTypeParseException.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimeTypeParseException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimeTypeParseException.java
@@ -5360,7 +5360,7 @@
 +        super(s);
 +    }
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/MimetypesFileTypeMap.java b/drop_included/jaf_src/src/javax/activation/MimetypesFileTypeMap.java
+diff --git a/drop_included/jaf_src/src/javax/activation/MimetypesFileTypeMap.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimetypesFileTypeMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimetypesFileTypeMap.java
@@ -5701,7 +5701,7 @@
 +    }
 +    */
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/SecuritySupport.java b/drop_included/jaf_src/src/javax/activation/SecuritySupport.java
+diff --git a/drop_included/jaf_src/src/javax/activation/SecuritySupport.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/SecuritySupport.java
@@ -5837,7 +5837,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/URLDataSource.java b/drop_included/jaf_src/src/javax/activation/URLDataSource.java
+diff --git a/drop_included/jaf_src/src/javax/activation/URLDataSource.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/URLDataSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/URLDataSource.java
@@ -5979,7 +5979,7 @@
 +        return url;
 +    }
 +}
-diff --git a/drop_included/jaf_src/src/javax/activation/UnsupportedDataTypeException.java b/drop_included/jaf_src/src/javax/activation/UnsupportedDataTypeException.java
+diff --git a/drop_included/jaf_src/src/javax/activation/UnsupportedDataTypeException.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/UnsupportedDataTypeException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/UnsupportedDataTypeException.java
@@ -6041,7 +6041,7 @@
 +        super(s);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/LICENSE b/drop_included/jaxws_src/LICENSE
+diff --git a/drop_included/jaxws_src/LICENSE openjdk/jaxws/drop_included/jaxws_src/LICENSE
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/LICENSE
@@ -6393,7 +6393,7 @@
 +    you modify this library, you may extend this exception to your version of
 +    the library, but you are not obligated to do so.  If you do not wish to do
 +    so, delete this exception statement from your version.
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/ClassType.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/ClassType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/ClassType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/ClassType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/ClassType.java
@@ -6446,7 +6446,7 @@
 +    public static final ClassType ANNOTATION_TYPE_DECL = new ClassType("@interface");
 +    public static final ClassType ENUM = new ClassType("enum");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/CodeWriter.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/CodeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/CodeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/CodeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/CodeWriter.java
@@ -6554,7 +6554,7 @@
 +     */
 +    public abstract void close() throws IOException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotatable.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotatable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotatable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotatable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotatable.java
@@ -6615,7 +6615,7 @@
 +     */
 +    <W extends JAnnotationWriter> W annotate2(Class<W> clazz);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationArrayMember.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationArrayMember.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationArrayMember.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationArrayMember.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationArrayMember.java
@@ -6777,7 +6777,7 @@
 +        f.nl().o().p('}');
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationStringValue.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationStringValue.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationStringValue.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationStringValue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationStringValue.java
@@ -6831,7 +6831,7 @@
 +        f.g(value);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationUse.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationUse.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationUse.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationUse.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationUse.java
@@ -7126,7 +7126,7 @@
 +        return memberValues.size()==1 && memberValues.containsKey("value");
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationValue.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationValue.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationValue.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationValue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationValue.java
@@ -7165,7 +7165,7 @@
 + */
 +public abstract class JAnnotationValue implements JGenerable {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationWriter.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationWriter.java
@@ -7223,7 +7223,7 @@
 +     */
 +    Class<A> getAnnotationType();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnonymousClass.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnonymousClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnonymousClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnonymousClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnonymousClass.java
@@ -7276,7 +7276,7 @@
 +        return base.fullName();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArray.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArray.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArray.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArray.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArray.java
@@ -7368,7 +7368,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayClass.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayClass.java
@@ -7495,7 +7495,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayCompRef.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayCompRef.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayCompRef.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayCompRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayCompRef.java
@@ -7571,7 +7571,7 @@
 +                return JExpr.assignPlus(this,rhs);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignment.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignment.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignment.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignment.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignment.java
@@ -7633,7 +7633,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignmentTarget.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignmentTarget.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignmentTarget.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignmentTarget.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignmentTarget.java
@@ -7677,7 +7677,7 @@
 +    JExpression assign(JExpression rhs);
 +    JExpression assignPlus(JExpression rhs);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAtom.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAtom.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAtom.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAtom.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAtom.java
@@ -7725,7 +7725,7 @@
 +        f.p(what);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBlock.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBlock.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBlock.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBlock.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBlock.java
@@ -8185,7 +8185,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBreak.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBreak.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBreak.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBreak.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBreak.java
@@ -8242,7 +8242,7 @@
 +            f.p("break").p(label.label).p(';').nl();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCase.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCase.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCase.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCase.java
@@ -8330,7 +8330,7 @@
 +        f.o();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCast.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCast.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCast.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCast.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCast.java
@@ -8397,7 +8397,7 @@
 +        f.p("((").g(type).p(')').g(object).p(')');
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCatchBlock.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCatchBlock.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCatchBlock.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCatchBlock.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCatchBlock.java
@@ -8462,7 +8462,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClass.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClass.java
@@ -8819,7 +8819,7 @@
 +        f.p("{@link ").g(this).p('}');
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClassAlreadyExistsException.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClassAlreadyExistsException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClassAlreadyExistsException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClassAlreadyExistsException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClassAlreadyExistsException.java
@@ -8873,7 +8873,7 @@
 +        return existing;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClassContainer.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClassContainer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClassContainer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClassContainer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JClassContainer.java
@@ -9042,7 +9042,7 @@
 +    public JDefinedClass _enum (String name) throws JClassAlreadyExistsException;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCodeModel.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCodeModel.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCodeModel.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCodeModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCodeModel.java
@@ -9704,7 +9704,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCommentPart.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCommentPart.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCommentPart.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCommentPart.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JCommentPart.java
@@ -9843,7 +9843,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JConditional.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JConditional.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JConditional.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JConditional.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JConditional.java
@@ -9953,7 +9953,7 @@
 +        f.nl();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JContinue.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JContinue.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JContinue.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JContinue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JContinue.java
@@ -10011,7 +10011,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDeclaration.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDeclaration.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDeclaration.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDeclaration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDeclaration.java
@@ -10054,7 +10054,7 @@
 +    public void declare(JFormatter f);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDefinedClass.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDefinedClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDefinedClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDefinedClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDefinedClass.java
@@ -10935,7 +10935,7 @@
 +        return TypedAnnotationWriter.create(clazz,this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDirectClass.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDirectClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDirectClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDirectClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDirectClass.java
@@ -11022,7 +11022,7 @@
 +        return this;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDoLoop.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDoLoop.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDoLoop.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDoLoop.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDoLoop.java
@@ -11099,7 +11099,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDocComment.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDocComment.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDocComment.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDocComment.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JDocComment.java
@@ -11299,7 +11299,7 @@
 +
 +    private static final String INDENT = " *     ";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JEnumConstant.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JEnumConstant.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JEnumConstant.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JEnumConstant.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JEnumConstant.java
@@ -11452,7 +11452,7 @@
 +        f.t(type).p('.').p(name);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpr.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpr.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpr.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpr.java
@@ -11716,7 +11716,7 @@
 +        };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpression.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpression.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpression.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpression.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpression.java
@@ -11871,7 +11871,7 @@
 +    JFieldRef ref(String field);
 +    JArrayCompRef component(JExpression index);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpressionImpl.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpressionImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpressionImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpressionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JExpressionImpl.java
@@ -12040,7 +12040,7 @@
 +        return JExpr.component(this, index);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFieldRef.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFieldRef.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFieldRef.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFieldRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFieldRef.java
@@ -12164,7 +12164,7 @@
 +        return JExpr.assignPlus(this, rhs);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFieldVar.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFieldVar.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFieldVar.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFieldVar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFieldVar.java
@@ -12260,7 +12260,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JForEach.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JForEach.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JForEach.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JForEach.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JForEach.java
@@ -12339,7 +12339,7 @@
 +        }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JForLoop.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JForLoop.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JForLoop.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JForLoop.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JForLoop.java
@@ -12432,7 +12432,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFormatter.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFormatter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFormatter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFormatter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JFormatter.java
@@ -12978,7 +12978,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerable.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerable.java
@@ -13021,7 +13021,7 @@
 +    public void generate(JFormatter f);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerifiable.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerifiable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerifiable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerifiable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerifiable.java
@@ -13081,7 +13081,7 @@
 +     */
 +    JTypeVar[] typeParams();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerifiableImpl.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerifiableImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerifiableImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerifiableImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JGenerifiableImpl.java
@@ -13164,7 +13164,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JInvocation.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JInvocation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JInvocation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JInvocation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JInvocation.java
@@ -13347,7 +13347,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JJavaName.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JJavaName.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JJavaName.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JJavaName.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JJavaName.java
@@ -13604,7 +13604,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JLabel.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JLabel.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JLabel.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JLabel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JLabel.java
@@ -13660,7 +13660,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMethod.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMethod.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMethod.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMethod.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMethod.java
@@ -14122,7 +14122,7 @@
 +                return outer.owner();
 +        }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMod.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMod.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMod.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMod.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMod.java
@@ -14171,7 +14171,7 @@
 +    public final static int TRANSIENT    = 0x100;
 +    public final static int VOLATILE     = 0x200;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMods.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMods.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMods.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMods.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JMods.java
@@ -14323,7 +14323,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JNarrowedClass.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JNarrowedClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JNarrowedClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JNarrowedClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JNarrowedClass.java
@@ -14544,7 +14544,7 @@
 +        return args;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JNullType.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JNullType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JNullType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JNullType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JNullType.java
@@ -14612,7 +14612,7 @@
 +        return this;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JOp.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JOp.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JOp.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JOp.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JOp.java
@@ -14871,7 +14871,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JPackage.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JPackage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JPackage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JPackage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JPackage.java
@@ -15343,7 +15343,7 @@
 +        return new JFormatter(new PrintWriter(bw));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JPrimitiveType.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JPrimitiveType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JPrimitiveType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JPrimitiveType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JPrimitiveType.java
@@ -15471,7 +15471,7 @@
 +        f.p(typeName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JResourceFile.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JResourceFile.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JResourceFile.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JResourceFile.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JResourceFile.java
@@ -15541,7 +15541,7 @@
 +     */
 +    protected abstract void build( OutputStream os ) throws IOException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JReturn.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JReturn.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JReturn.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JReturn.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JReturn.java
@@ -15601,7 +15601,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JStatement.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JStatement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JStatement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JStatement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JStatement.java
@@ -15644,7 +15644,7 @@
 +    public void state(JFormatter f);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JStringLiteral.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JStringLiteral.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JStringLiteral.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JStringLiteral.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JStringLiteral.java
@@ -15696,7 +15696,7 @@
 +        f.p(JExpr.quotify('"', str));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JSwitch.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JSwitch.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JSwitch.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JSwitch.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JSwitch.java
@@ -15790,7 +15790,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JThrow.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JThrow.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JThrow.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JThrow.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JThrow.java
@@ -15851,7 +15851,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTryBlock.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTryBlock.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTryBlock.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTryBlock.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTryBlock.java
@@ -15925,7 +15925,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JType.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JType.java
@@ -16112,7 +16112,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTypeVar.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTypeVar.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTypeVar.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTypeVar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTypeVar.java
@@ -16237,7 +16237,7 @@
 +        f.id(name);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTypeWildcard.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTypeWildcard.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTypeWildcard.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTypeWildcard.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JTypeWildcard.java
@@ -16351,7 +16351,7 @@
 +            f.p("? extends").g(bound);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JVar.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JVar.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JVar.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JVar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JVar.java
@@ -16564,7 +16564,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JWhileLoop.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JWhileLoop.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JWhileLoop.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JWhileLoop.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JWhileLoop.java
@@ -16642,7 +16642,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/TypedAnnotationWriter.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/TypedAnnotationWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/TypedAnnotationWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/TypedAnnotationWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/TypedAnnotationWriter.java
@@ -16893,7 +16893,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JBinaryFile.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JBinaryFile.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JBinaryFile.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JBinaryFile.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JBinaryFile.java
@@ -16959,7 +16959,7 @@
 +        os.write( baos.toByteArray() );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JPropertyFile.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JPropertyFile.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JPropertyFile.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JPropertyFile.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JPropertyFile.java
@@ -17024,7 +17024,7 @@
 +        data.store(out,null);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JSerializedObject.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JSerializedObject.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JSerializedObject.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JSerializedObject.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JSerializedObject.java
@@ -17090,7 +17090,7 @@
 +        oos.close();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JStaticFile.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JStaticFile.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JStaticFile.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JStaticFile.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JStaticFile.java
@@ -17174,7 +17174,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JStaticJavaFile.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JStaticJavaFile.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JStaticJavaFile.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JStaticJavaFile.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JStaticJavaFile.java
@@ -17417,7 +17417,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JTextFile.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JTextFile.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JTextFile.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JTextFile.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/fmt/JTextFile.java
@@ -17480,7 +17480,7 @@
 +        w.close();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/package-info.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/package-info.java
@@ -17600,7 +17600,7 @@
 +
 +import java.util.List;
 +import java.util.Map;
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/ClassNameComparator.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/ClassNameComparator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/ClassNameComparator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/ClassNameComparator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/ClassNameComparator.java
@@ -17650,7 +17650,7 @@
 +
 +    public static final Comparator<JClass> theInstance = new ClassNameComparator();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/EncoderFactory.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/EncoderFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/EncoderFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/EncoderFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/EncoderFactory.java
@@ -17726,7 +17726,7 @@
 +        return encoder;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/JavadocEscapeWriter.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/JavadocEscapeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/JavadocEscapeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/JavadocEscapeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/JavadocEscapeWriter.java
@@ -17815,7 +17815,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/MS1252Encoder.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/MS1252Encoder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/MS1252Encoder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/MS1252Encoder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/MS1252Encoder.java
@@ -18043,7 +18043,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/SingleByteEncoder.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/SingleByteEncoder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/SingleByteEncoder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/SingleByteEncoder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/SingleByteEncoder.java
@@ -18207,7 +18207,7 @@
 +                (inputChar & mask2));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/Surrogate.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/Surrogate.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/Surrogate.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/Surrogate.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/Surrogate.java
@@ -18567,7 +18567,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java
@@ -18661,7 +18661,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/FileCodeWriter.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/FileCodeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/FileCodeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/FileCodeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/FileCodeWriter.java
@@ -18768,7 +18768,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/FilterCodeWriter.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/FilterCodeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/FilterCodeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/FilterCodeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/FilterCodeWriter.java
@@ -18831,7 +18831,7 @@
 +        core.close();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/ProgressCodeWriter.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/ProgressCodeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/ProgressCodeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/ProgressCodeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/ProgressCodeWriter.java
@@ -18907,7 +18907,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/PrologCodeWriter.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/PrologCodeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/PrologCodeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/PrologCodeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/PrologCodeWriter.java
@@ -18998,7 +18998,7 @@
 +        return w;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java
@@ -19079,7 +19079,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/ZipCodeWriter.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/ZipCodeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/ZipCodeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/ZipCodeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/writer/ZipCodeWriter.java
@@ -19160,7 +19160,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/Builder.java b/drop_included/jaxws_src/src/com/sun/istack/internal/Builder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/Builder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/Builder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/Builder.java
@@ -19198,7 +19198,7 @@
 +public interface Builder<T> {
 +    T build();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/ByteArrayDataSource.java b/drop_included/jaxws_src/src/com/sun/istack/internal/ByteArrayDataSource.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/ByteArrayDataSource.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/ByteArrayDataSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/ByteArrayDataSource.java
@@ -19272,7 +19272,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/FinalArrayList.java b/drop_included/jaxws_src/src/com/sun/istack/internal/FinalArrayList.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/FinalArrayList.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/FinalArrayList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/FinalArrayList.java
@@ -19326,7 +19326,7 @@
 +        super(ts);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/FragmentContentHandler.java b/drop_included/jaxws_src/src/com/sun/istack/internal/FragmentContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/FragmentContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/FragmentContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/FragmentContentHandler.java
@@ -19387,7 +19387,7 @@
 +        // noop
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/Interned.java b/drop_included/jaxws_src/src/com/sun/istack/internal/Interned.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/Interned.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/Interned.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/Interned.java
@@ -19446,7 +19446,7 @@
 +@Target({ElementType.FIELD,ElementType.METHOD,ElementType.PARAMETER,ElementType.LOCAL_VARIABLE})
 +public @interface Interned {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/NotNull.java b/drop_included/jaxws_src/src/com/sun/istack/internal/NotNull.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/NotNull.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/NotNull.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/NotNull.java
@@ -19493,7 +19493,7 @@
 +@Target({ElementType.FIELD,ElementType.METHOD,ElementType.PARAMETER,ElementType.LOCAL_VARIABLE})
 +public @interface NotNull {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/Nullable.java b/drop_included/jaxws_src/src/com/sun/istack/internal/Nullable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/Nullable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/Nullable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/Nullable.java
@@ -19540,7 +19540,7 @@
 +@Target({ElementType.FIELD,ElementType.METHOD,ElementType.PARAMETER,ElementType.LOCAL_VARIABLE})
 +public @interface Nullable {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/Pool.java b/drop_included/jaxws_src/src/com/sun/istack/internal/Pool.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/Pool.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/Pool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/Pool.java
@@ -19660,7 +19660,7 @@
 +        protected abstract @NotNull T create();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/SAXException2.java b/drop_included/jaxws_src/src/com/sun/istack/internal/SAXException2.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/SAXException2.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/SAXException2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/SAXException2.java
@@ -19716,7 +19716,7 @@
 +        return getException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/SAXParseException2.java b/drop_included/jaxws_src/src/com/sun/istack/internal/SAXParseException2.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/SAXParseException2.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/SAXParseException2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/SAXParseException2.java
@@ -19777,7 +19777,7 @@
 +        return getException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/XMLStreamException2.java b/drop_included/jaxws_src/src/com/sun/istack/internal/XMLStreamException2.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/XMLStreamException2.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/XMLStreamException2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/XMLStreamException2.java
@@ -19844,7 +19844,7 @@
 +        return getNestedException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/XMLStreamReaderToContentHandler.java b/drop_included/jaxws_src/src/com/sun/istack/internal/XMLStreamReaderToContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/XMLStreamReaderToContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/XMLStreamReaderToContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/XMLStreamReaderToContentHandler.java
@@ -20236,7 +20236,7 @@
 +        // this event is listed in the javadoc, but not in the spec.
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/localization/Localizable.java b/drop_included/jaxws_src/src/com/sun/istack/internal/localization/Localizable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/localization/Localizable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/localization/Localizable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/localization/Localizable.java
@@ -20304,7 +20304,7 @@
 +     */
 +    public static final String NOT_LOCALIZABLE = new String("\u0000");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/localization/LocalizableMessage.java b/drop_included/jaxws_src/src/com/sun/istack/internal/localization/LocalizableMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/localization/LocalizableMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/localization/LocalizableMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/localization/LocalizableMessage.java
@@ -20365,7 +20365,7 @@
 +        return _bundlename;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/localization/LocalizableMessageFactory.java b/drop_included/jaxws_src/src/com/sun/istack/internal/localization/LocalizableMessageFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/localization/LocalizableMessageFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/localization/LocalizableMessageFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/localization/LocalizableMessageFactory.java
@@ -20413,7 +20413,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/localization/Localizer.java b/drop_included/jaxws_src/src/com/sun/istack/internal/localization/Localizer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/localization/Localizer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/localization/Localizer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/localization/Localizer.java
@@ -20567,7 +20567,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/package-info.java b/drop_included/jaxws_src/src/com/sun/istack/internal/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/package-info.java
@@ -20600,7 +20600,7 @@
 + * istack-commons runtime utilities.
 + */
 +package com.sun.istack.internal;
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/tools/APTTypeVisitor.java b/drop_included/jaxws_src/src/com/sun/istack/internal/tools/APTTypeVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/tools/APTTypeVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/tools/APTTypeVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/tools/APTTypeVisitor.java
@@ -20677,7 +20677,7 @@
 +    protected abstract T onWildcard(WildcardType type, P param);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/tools/MaskingClassLoader.java b/drop_included/jaxws_src/src/com/sun/istack/internal/tools/MaskingClassLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/tools/MaskingClassLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/tools/MaskingClassLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/tools/MaskingClassLoader.java
@@ -20750,7 +20750,7 @@
 +        return super.loadClass(name, resolve);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/tools/ParallelWorldClassLoader.java b/drop_included/jaxws_src/src/com/sun/istack/internal/tools/ParallelWorldClassLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/tools/ParallelWorldClassLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/tools/ParallelWorldClassLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/tools/ParallelWorldClassLoader.java
@@ -20894,7 +20894,7 @@
 +        return new URL(url);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/tools/package-info.java b/drop_included/jaxws_src/src/com/sun/istack/internal/tools/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/tools/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/tools/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/tools/package-info.java
@@ -20930,7 +20930,7 @@
 + * This includes code that relies on APT, javac, etc.
 + */
 +package com.sun.istack.internal.tools;
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java b/drop_included/jaxws_src/src/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java
@@ -21042,7 +21042,7 @@
 +        return wsAP;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/ws/package-info.java b/drop_included/jaxws_src/src/com/sun/istack/internal/ws/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/istack/internal/ws/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/ws/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/istack/internal/ws/package-info.java
@@ -21086,13 +21086,13 @@
 + * @ArchitectureDocument
 +*/
 +package com.sun.istack.internal.ws;
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory b/drop_included/jaxws_src/src/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
 @@ -0,0 +1,1 @@
 +com.sun.istack.internal.ws.AnnotationProcessorFactoryImpl
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin b/drop_included/jaxws_src/src/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin
@@ -21101,7 +21101,7 @@
 +com.sun.tools.internal.xjc.addon.sync.SynchronizedMethodAddOn
 +com.sun.tools.internal.xjc.addon.at_generated.PluginImpl
 +com.sun.tools.internal.xjc.addon.episode.PluginImpl
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/ConfigReader.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/ConfigReader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/ConfigReader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/ConfigReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/ConfigReader.java
@@ -21389,7 +21389,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/MessageBundle.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/MessageBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/MessageBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/MessageBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/MessageBundle.properties
@@ -21438,7 +21438,7 @@
 +\ \ \ \ -episode <file>   :  generate episode file for separate compilation\n\
 +\ \ \ \ -version          :  display version information\n\
 +\ \ \ \ -help             :  display this usage message
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/Messages.java
@@ -21496,7 +21496,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/NGCCRuntimeEx.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/NGCCRuntimeEx.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/NGCCRuntimeEx.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/NGCCRuntimeEx.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/NGCCRuntimeEx.java
@@ -21668,7 +21668,7 @@
 +                getLocator()));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/SchemaGenerator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/SchemaGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/SchemaGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/SchemaGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/SchemaGenerator.java
@@ -21891,7 +21891,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java
@@ -21952,7 +21952,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/AnnotationParser.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/AnnotationParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/AnnotationParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/AnnotationParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/AnnotationParser.java
@@ -22078,7 +22078,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java
@@ -22138,7 +22138,7 @@
 +        return new AnnotationParser(atds,env);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Const.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Const.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Const.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Const.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Const.java
@@ -22190,7 +22190,7 @@
 +
 +    public static final String DEBUG_OPTION = "-Ajaxb.debug";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java
@@ -22281,7 +22281,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java
@@ -22454,7 +22454,7 @@
 +        return m.getDeclaringType().getQualifiedName()+'#'+m.getSimpleName();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/MessageBundle.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/MessageBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/MessageBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/MessageBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/MessageBundle.properties
@@ -22492,7 +22492,7 @@
 +
 +OPERAND_MISSING = \
 +    Option "{0}" is missing an operand.
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Messages.java
@@ -22549,7 +22549,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Options.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Options.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Options.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Options.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/Options.java
@@ -22653,7 +22653,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/SchemaGenerator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/SchemaGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/SchemaGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/SchemaGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/SchemaGenerator.java
@@ -22800,7 +22800,7 @@
 +        };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/package.html b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/apt/package.html
@@ -22835,7 +22835,7 @@
 +This package hosts a driver that runs inside APT for java-to-schema processing,
 +and additional implementations that deal primarily with APT.
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java
@@ -23465,7 +23465,7 @@
 +}
 +
 +// end of AttributesImpl.java
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Classes.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Classes.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Classes.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Classes.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Classes.java
@@ -23797,7 +23797,7 @@
 +       public List getExcludes() { return $runtime.getExcludePatterns(this.excludes);}
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Config.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Config.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Config.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Config.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Config.java
@@ -24128,7 +24128,7 @@
 +   public List getSchema() { return this.schema;}
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java
@@ -24174,7 +24174,7 @@
 +    void enterAttribute(String uri, String localName, String qname) throws SAXException;
 +    void leaveAttribute(String uri, String localName, String qname) throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java
@@ -24228,7 +24228,7 @@
 +    void sendLeaveAttribute( int receiverThreadId, String uri, String local, String qname ) throws SAXException;
 +    void sendText( int receiverThreadId, String value ) throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java
@@ -24423,7 +24423,7 @@
 +        getRuntime().unexpectedX("/@"+qname);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java
@@ -24777,7 +24777,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java
@@ -25344,7 +25344,7 @@
 +        needIndent=true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Schema.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Schema.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Schema.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Schema.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/Schema.java
@@ -25672,7 +25672,7 @@
 +       public File getLocation() { return this.location;}
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/config.rng b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/config.rng
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/config.rng openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/config.rng
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/config.rng
@@ -25807,7 +25807,7 @@
 +     </element>
 +  </define>
 +</grammar>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/config.xsd b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/config.xsd
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/config.xsd openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/config.xsd
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/gen/config/config.xsd
@@ -25880,7 +25880,7 @@
 +    </xs:complexType>
 +  </xs:element>
 +</xs:schema>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/model/nav/APTNavigator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/model/nav/APTNavigator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/model/nav/APTNavigator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/model/nav/APTNavigator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/model/nav/APTNavigator.java
@@ -26437,7 +26437,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/Invoker.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/Invoker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/Invoker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/Invoker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/Invoker.java
@@ -26681,7 +26681,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/ToolVersion.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/ToolVersion.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/ToolVersion.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/ToolVersion.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/ToolVersion.java
@@ -26724,7 +26724,7 @@
 +
 +    public static final Version VERSION = Version.create(ToolVersion.class.getResourceAsStream("version.properties"));
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/WsGen.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/WsGen.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/WsGen.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/WsGen.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/WsGen.java
@@ -26789,7 +26789,7 @@
 +        return new WsgenTool(System.out).run(args) ? 0 : 1;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/WsImport.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/WsImport.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/WsImport.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/WsImport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/WsImport.java
@@ -26854,7 +26854,7 @@
 +        return new WsimportTool(System.out).run(args) ? 0 : 1;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java
@@ -26906,7 +26906,7 @@
 +     */
 +     public abstract void writeMethodAnnotations(TWSDLOperation wsdlOperation, JMethod jMethod);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/WsgenExtension.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/WsgenExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/WsgenExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/WsgenExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/WsgenExtension.java
@@ -26954,7 +26954,7 @@
 + */
 +public abstract class WsgenExtension {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/WsgenProtocol.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/WsgenProtocol.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/WsgenProtocol.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/WsgenProtocol.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/WsgenProtocol.java
@@ -27011,7 +27011,7 @@
 +     */
 +    String lexical();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java
@@ -27096,7 +27096,7 @@
 +     */
 +    TWSDLExtensible getParent();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java
@@ -27140,7 +27140,7 @@
 +     */
 +    TWSDLExtensible getParent();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java
@@ -27361,7 +27361,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java
@@ -27409,7 +27409,7 @@
 +     */
 +    Map<String, JClass> getFaults();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java
@@ -27496,7 +27496,7 @@
 +    Locator getLocation(Element e);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/package-info.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/package-info.java
@@ -27628,7 +27628,7 @@
 + * @ArchitectureDocument
 + **/
 +package com.sun.tools.internal.ws;
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/ProcessorException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/ProcessorException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/ProcessorException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/ProcessorException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/ProcessorException.java
@@ -27688,7 +27688,7 @@
 +        return "com.sun.tools.internal.ws.resources.processor";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java
@@ -27856,7 +27856,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java
@@ -28091,7 +28091,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java
@@ -28138,7 +28138,7 @@
 +    public static final String RESPONSE = "Response";
 +    public static final String FAULT_CLASS_MEMBER_NAME = "faultInfo";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorException.java
@@ -28190,7 +28190,7 @@
 +        return "com.sun.tools.internal.ws.resources.generator";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java
@@ -28262,7 +28262,7 @@
 +        return className;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java
@@ -28315,7 +28315,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/Names.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/Names.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/Names.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/Names.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/Names.java
@@ -28499,7 +28499,7 @@
 +        reservedWords.put("enum", "_enum");
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java
@@ -28972,7 +28972,7 @@
 +        extensionHandlers.add(h);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java
@@ -29201,7 +29201,7 @@
 +        webEndpointAnn.param("name", port.getName().getLocalPart());
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java
@@ -29300,7 +29300,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AbstractType.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AbstractType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AbstractType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AbstractType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AbstractType.java
@@ -29450,7 +29450,7 @@
 +    private String version = null;
 +    private Map properties;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AsyncOperation.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AsyncOperation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AsyncOperation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AsyncOperation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AsyncOperation.java
@@ -29587,7 +29587,7 @@
 +    private AbstractType _responseBean;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java
@@ -29634,7 +29634,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Block.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Block.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Block.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Block.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Block.java
@@ -29716,7 +29716,7 @@
 +    private AbstractType type;
 +    private int location;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java
@@ -29858,7 +29858,7 @@
 +    protected void visitFaultBlock(Block block) throws Exception {}
 +    protected void visit(Parameter parameter) throws Exception {}
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Fault.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Fault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Fault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Fault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Fault.java
@@ -30040,7 +30040,7 @@
 +
 +    private String wsdlFaultName;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/HeaderFault.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/HeaderFault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/HeaderFault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/HeaderFault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/HeaderFault.java
@@ -30104,7 +30104,7 @@
 +    private QName _message;
 +    private String _part;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Message.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Message.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Message.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Message.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Message.java
@@ -30342,7 +30342,7 @@
 +    private List<Parameter> _parameters = new ArrayList<Parameter>();
 +    private Map<String, Parameter> _parametersByName = new HashMap<String, Parameter>();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Model.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Model.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Model.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Model.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Model.java
@@ -30505,7 +30505,7 @@
 +    private String source;
 +    private JAXBModel jaxBModel = null;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelException.java
@@ -30566,7 +30566,7 @@
 +        return "com.sun.tools.internal.ws.resources.model";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelObject.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelObject.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelObject.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelObject.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelObject.java
@@ -30686,7 +30686,7 @@
 +    private String javaDoc;
 +    private Map _properties;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelProperties.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelProperties.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelProperties.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelProperties.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelProperties.java
@@ -30767,7 +30767,7 @@
 +    public static final String PROPERTY_JAVA_PORT_NAME =
 +        "com.sun.xml.internal.ws.processor.model.JavaPortName";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelVisitor.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/ModelVisitor.java
@@ -30814,7 +30814,7 @@
 +    public void visit(Block block) throws Exception;
 +    public void visit(Parameter parameter) throws Exception;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Operation.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Operation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Operation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Operation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Operation.java
@@ -31076,7 +31076,7 @@
 +    private com.sun.tools.internal.ws.wsdl.document.Operation wsdlOperation;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Parameter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Parameter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Parameter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Parameter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Parameter.java
@@ -31274,7 +31274,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Port.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Port.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Port.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Port.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Port.java
@@ -31458,7 +31458,7 @@
 +    private Map<String, Operation> operationsByName = new HashMap<String, Operation>();
 +    public Map<QName, PortType> portTypes = new HashMap<QName, PortType>();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Request.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Request.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Request.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Request.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Request.java
@@ -31507,7 +31507,7 @@
 +        visitor.visit(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Response.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Response.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Response.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Response.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Response.java
@@ -31586,7 +31586,7 @@
 +
 +    private Map _faultBlocks = new HashMap();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Service.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Service.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Service.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Service.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/Service.java
@@ -31711,7 +31711,7 @@
 +    private Map<QName, Port> portsByName = new HashMap<QName, Port>();
 +    private JavaInterface javaInterface;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java
@@ -31763,7 +31763,7 @@
 +     */
 +    void saveTo(ContentHandler receiver);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java
@@ -31845,7 +31845,7 @@
 +    private JavaType elementType;
 +    private String soapArrayHolderName;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaException.java
@@ -31889,7 +31889,7 @@
 +        super(name, present, owner);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java
@@ -32060,7 +32060,7 @@
 +    private List methods = new ArrayList();
 +    private List interfaces = new ArrayList();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java
@@ -32194,7 +32194,7 @@
 +        return param;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java
@@ -32295,7 +32295,7 @@
 +    private boolean holder;
 +    private String holderName;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java
@@ -32346,7 +32346,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java
@@ -32480,7 +32480,7 @@
 +    private Object owner;
 +    private int constructorPos;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java
@@ -32660,7 +32660,7 @@
 +    private Object owner;
 +    private boolean isAbstract = false;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaType.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/java/JavaType.java
@@ -32810,7 +32810,7 @@
 +        this.holderName = holderName;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java
@@ -32914,7 +32914,7 @@
 +    private JAXBProperty _prop;
 +    private static final String JAXB_UNIQUE_PARRAM = "__jaxbUniqueParam_";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java
@@ -33019,7 +33019,7 @@
 +        return wrapperStyleDrilldown;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java
@@ -33164,7 +33164,7 @@
 +
 +    private Set<String> generatedClassNames;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java
@@ -33251,7 +33251,7 @@
 +        return elementName;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java
@@ -33393,7 +33393,7 @@
 +    private Set _subtypes = null;
 +    private JAXBStructuredType _parentType = null;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java
@@ -33521,7 +33521,7 @@
 +    private boolean unwrapped = false;
 +    private List<JAXBProperty> wrapperChildren;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java
@@ -33603,7 +33603,7 @@
 +        this.type = type;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java
@@ -33644,7 +33644,7 @@
 +    public void visit(JAXBType type) throws Exception;
 +    public void visit(RpcLitStructure type) throws Exception;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java
@@ -33733,7 +33733,7 @@
 +        this.schemaTypeName = type;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java
@@ -33829,7 +33829,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/Util.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/Util.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/Util.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/Util.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/model/jaxb/Util.java
@@ -33899,7 +33899,7 @@
 +    static final String MAGIC1 = MAGIC+"1";
 +    static final String MAGIC2 = MAGIC+"2";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java
@@ -34068,7 +34068,7 @@
 +        return (JavaSimpleType) javaTypes.get(classname);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/Modeler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/Modeler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/Modeler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/Modeler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/Modeler.java
@@ -34120,7 +34120,7 @@
 +     */
 +    public Model buildModel();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java
@@ -34228,7 +34228,7 @@
 +     public static final String JAX_WS_MAP_ENTRY_CLASSNAME   = "com.sun.xml.internal.ws.encoding.soap.JAXWSMapEntry";
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/ModelerException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/ModelerException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/ModelerException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/ModelerException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/ModelerException.java
@@ -34290,7 +34290,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java
@@ -34479,7 +34479,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java
@@ -34581,7 +34581,7 @@
 +        members.add(member);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java
@@ -34679,7 +34679,7 @@
 +        return apTypes.getErasure(type);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java
@@ -34764,7 +34764,7 @@
 +        return paramName.compareTo(member.paramName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java
@@ -34833,7 +34833,7 @@
 +    public void onError(String s);
 +    public void onError(SourcePosition pos, Localizable msg) throws ModelerException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java
@@ -35088,7 +35088,7 @@
 +        skipProperties.add("getStackTrace");
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java
@@ -35130,7 +35130,7 @@
 +
 +    public TypeMirror create(AnnotationProcessorEnvironment apEnv);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java
@@ -35246,7 +35246,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java
@@ -35671,7 +35671,7 @@
 +        return javaName;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java
@@ -35770,7 +35770,7 @@
 +    public static final String PARAM_NAME                   = "param-name";
 +    public static final String PARAM_VALUE                  = "param-value";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java
@@ -36569,7 +36569,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java
@@ -37189,7 +37189,7 @@
 +        body.assign( JExpr._this().ref(paramName), param );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java
@@ -37257,7 +37257,7 @@
 +        members.add(member);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java
@@ -37335,7 +37335,7 @@
 +        this.name = name;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java
@@ -37417,7 +37417,7 @@
 +    private ClassNameCollector classNameCollector;
 +    private Set<String> jaxbClasses;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java
@@ -37518,7 +37518,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java
@@ -37667,7 +37667,7 @@
 +    protected static final LocatorImpl NULL_LOCATOR = new LocatorImpl();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/MimeHelper.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/MimeHelper.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/MimeHelper.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/MimeHelper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/MimeHelper.java
@@ -37778,7 +37778,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java
@@ -38046,7 +38046,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java
@@ -38354,7 +38354,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java
@@ -41150,7 +41150,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java
@@ -41936,7 +41936,7 @@
 +    protected WSDLDocument document;
 +    protected static final LocatorImpl NULL_LOCATOR = new LocatorImpl();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java
@@ -42204,7 +42204,7 @@
 +    private Set _conflictingClassNames;
 +    private Set<QName> _portTypeNames;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java
@@ -42311,7 +42311,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/IndentingWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/IndentingWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/IndentingWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/IndentingWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/processor/util/IndentingWriter.java
@@ -42646,7 +42646,7 @@
 +        pln();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ConfigurationMessages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ConfigurationMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ConfigurationMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ConfigurationMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ConfigurationMessages.java
@@ -42716,7 +42716,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/GeneratorMessages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/GeneratorMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/GeneratorMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/GeneratorMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/GeneratorMessages.java
@@ -42846,7 +42846,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/JavacompilerMessages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/JavacompilerMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/JavacompilerMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/JavacompilerMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/JavacompilerMessages.java
@@ -42928,7 +42928,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ModelMessages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ModelMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ModelMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ModelMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ModelMessages.java
@@ -43640,7 +43640,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ModelerMessages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ModelerMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ModelerMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ModelerMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ModelerMessages.java
@@ -45259,7 +45259,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ProcessorMessages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ProcessorMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ProcessorMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ProcessorMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/ProcessorMessages.java
@@ -45317,7 +45317,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/UtilMessages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/UtilMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/UtilMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/UtilMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/UtilMessages.java
@@ -45399,7 +45399,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WebserviceapMessages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WebserviceapMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WebserviceapMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WebserviceapMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WebserviceapMessages.java
@@ -46309,7 +46309,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WscompileMessages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WscompileMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WscompileMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WscompileMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WscompileMessages.java
@@ -47108,7 +47108,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WsdlMessages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WsdlMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WsdlMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WsdlMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/WsdlMessages.java
@@ -48133,7 +48133,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/configuration.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/configuration.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/configuration.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/configuration.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/configuration.properties
@@ -48165,7 +48165,7 @@
 +
 +configuration.invalidElement=invalid element \"{2}\" in file \"{0}\" (line {1})
 +configuration.notBindingFile=Ignoring: binding file "\"{0}\". It is not a jaxws or a jaxb binding file.
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/generator.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/generator.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/generator.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/generator.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/generator.properties
@@ -48206,7 +48206,7 @@
 +generator.indentingwriter.charset.cantencode=WSDL has some characters which native java encoder can''t encode: \"{0}\"
 +generator.sei.classAlreadyExist=Could not generate SEI, class: {0} already exists. Rename wsdl:portType \"{1}\" using JAX-WS customization
 +generator.service.classAlreadyExist=Could not generate Service, class: {0} already exists. Rename wsdl:Service \"{1}\" using JAX-WS customization
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/javacompiler.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/javacompiler.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/javacompiler.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/javacompiler.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/javacompiler.properties
@@ -48242,7 +48242,7 @@
 +javacompiler.classpath.error={0} is not available in the classpath, requires Sun's JDK version 5.0 or latter.
 +javacompiler.nosuchmethod.error=There is no such method {0} available, requires Sun's JDK version 5.0 or latter.
 +javacompiler.error=error : {0}.
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/model.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/model.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/model.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/model.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/model.properties
@@ -48339,7 +48339,7 @@
 +
 +ConsoleErrorReporter.LineXOfY = \
 +        \ \ line {0} of {1}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/modeler.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/modeler.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/modeler.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/modeler.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/modeler.properties
@@ -48562,7 +48562,7 @@
 +wsdlmodeler.rpclit.unkownschematype=XML type \"{0}\" could not be resolved, XML to JAVA binding failed! Please check the wsdl:part \"{1}\" in the wsdl:message \"{2}\".
 +
 +wsdlmodeler.responsebean.notfound=wsimport failed to generate async response bean for operation: {0}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/processor.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/processor.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/processor.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/processor.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/processor.properties
@@ -48593,7 +48593,7 @@
 +#
 +
 +processor.missing.model=model is missing
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/util.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/util.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/util.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/util.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/util.properties
@@ -48626,7 +48626,7 @@
 +holder.valuefield.not.found=Could not find the field in the Holder that contains the Holder''s value: {0}
 +null.namespace.found=Encountered error in wsdl. Check namespace of element <{0}>
 +sax2dom.notsupported.createelement=SAX2DOMEx.DomImplDoesntSupportCreateElementNs: {0}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/webserviceap.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/webserviceap.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/webserviceap.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/webserviceap.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/webserviceap.properties
@@ -48787,7 +48787,7 @@
 +webserviceap.no.package.class.must.have.targetnamespace=@javax.jws.Webservice annotated classes that do not belong to a package must have the @javax.jws.Webservice.targetNamespace element.  Class\: {0}
 +
 +webserviceap.webservice.and.webserviceprovider=Classes cannot be annotated with both @javax.jws.WebService and @javax.xml.ws.WebServiceProvider.  Class\: {0}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/wscompile.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/wscompile.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/wscompile.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/wscompile.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/wscompile.properties
@@ -48997,7 +48997,7 @@
 +
 +wsimport.maxRedirectAttempt = \
 +  Can not get a WSDL maximum number of redirects(5) reached
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/wsdl.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/wsdl.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/wsdl.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/wsdl.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/resources/wsdl.properties
@@ -49142,7 +49142,7 @@
 +file.not.found={0} is unreachable
 +parsing.unableToGetMetadata= {0}\n\n{1}
 +failed.noservice=failed.noservice=Could not find wsdl:service in the provided WSDL(s): \n\n{0} At least one WSDL with at least one service definition needs to be provided.
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java
@@ -49246,7 +49246,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/spi/package-info.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/spi/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/spi/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/spi/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/spi/package-info.java
@@ -49283,7 +49283,7 @@
 + *  and WsImport that other applications can use.
 +*/
 +package com.sun.tools.internal.ws.spi;
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/ClassNameInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/ClassNameInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/ClassNameInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/ClassNameInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/ClassNameInfo.java
@@ -49361,7 +49361,7 @@
 +        return name.replace('$', '_');
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/ForkEntityResolver.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/ForkEntityResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/ForkEntityResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/ForkEntityResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/ForkEntityResolver.java
@@ -49420,7 +49420,7 @@
 +        return rhs.resolveEntity(systemId,systemId);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/WSDLParseException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/WSDLParseException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/WSDLParseException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/WSDLParseException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/WSDLParseException.java
@@ -49471,7 +49471,7 @@
 +        return "com.sun.tools.internal.ws.resources.util";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java
@@ -49528,7 +49528,7 @@
 +        return tool.run(args);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/xml/XmlUtil.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/xml/XmlUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/xml/XmlUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/xml/XmlUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/util/xml/XmlUtil.java
@@ -49596,7 +49596,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/version.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/version.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/version.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/version.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/version.properties
@@ -49630,7 +49630,7 @@
 +build-id=JAX-WS RI 2.1.6
 +major-version=2.1.6
 +build-version=JAX-WS RI 2.1.6
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/AbortException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/AbortException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/AbortException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/AbortException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/AbortException.java
@@ -49678,7 +49678,7 @@
 +    public AbortException() {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/AuthInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/AuthInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/AuthInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/AuthInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/AuthInfo.java
@@ -49747,7 +49747,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java
@@ -49813,7 +49813,7 @@
 +        return options;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/DefaultAuthTester.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/DefaultAuthTester.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/DefaultAuthTester.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/DefaultAuthTester.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/DefaultAuthTester.java
@@ -49884,7 +49884,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java
@@ -50043,7 +50043,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java
@@ -50207,7 +50207,7 @@
 +      return url;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java
@@ -50298,7 +50298,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java
@@ -50368,7 +50368,7 @@
 +        w = null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java
@@ -50467,7 +50467,7 @@
 +
 +    private static final Class[] compileMethodSignature = {String[].class, PrintWriter.class};
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/Options.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/Options.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/Options.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/Options.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/Options.java
@@ -50860,7 +50860,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java
@@ -50924,7 +50924,7 @@
 +        return f;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsgenOptions.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsgenOptions.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsgenOptions.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsgenOptions.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsgenOptions.java
@@ -51211,7 +51211,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsgenTool.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsgenTool.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsgenTool.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsgenTool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsgenTool.java
@@ -51644,7 +51644,7 @@
 +        supportedAnnotations = Collections.unmodifiableCollection(types);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportListener.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportListener.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportListener.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportListener.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportListener.java
@@ -51739,7 +51739,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportOptions.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportOptions.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportOptions.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportOptions.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportOptions.java
@@ -52177,7 +52177,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportTool.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportTool.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportTool.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportTool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wscompile/WsimportTool.java
@@ -52481,7 +52481,7 @@
 +        System.out.println(WscompileMessages.WSIMPORT_USAGE_EXAMPLES());
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Binding.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Binding.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Binding.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Binding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Binding.java
@@ -52656,7 +52656,7 @@
 +
 +    private TWSDLExtensible parent;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingFault.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingFault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingFault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingFault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingFault.java
@@ -52779,7 +52779,7 @@
 +
 +    private TWSDLExtensible parent;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingInput.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingInput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingInput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingInput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingInput.java
@@ -52899,7 +52899,7 @@
 +
 +    private TWSDLExtensible parent;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java
@@ -53129,7 +53129,7 @@
 +
 +    private TWSDLExtensible parent;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java
@@ -53249,7 +53249,7 @@
 +    private Documentation _documentation;
 +    private String _name;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Definitions.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Definitions.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Definitions.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Definitions.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Definitions.java
@@ -53486,7 +53486,7 @@
 +        return getWSDLElementName();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Documentation.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Documentation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Documentation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Documentation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Documentation.java
@@ -53543,7 +53543,7 @@
 +
 +    private String content;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Fault.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Fault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Fault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Fault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Fault.java
@@ -53705,7 +53705,7 @@
 +        this._action = _action;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Import.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Import.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Import.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Import.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Import.java
@@ -53798,7 +53798,7 @@
 +    private String _location;
 +    private String _namespace;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Input.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Input.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Input.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Input.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Input.java
@@ -53953,7 +53953,7 @@
 +        this._action = _action;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Kinds.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Kinds.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Kinds.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Kinds.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Kinds.java
@@ -54002,7 +54002,7 @@
 +    private Kinds() {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Message.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Message.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Message.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Message.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Message.java
@@ -54128,7 +54128,7 @@
 +    private List<MessagePart> _parts;
 +    private Map<String, MessagePart> _partsByName;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/MessagePart.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/MessagePart.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/MessagePart.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/MessagePart.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/MessagePart.java
@@ -54289,7 +54289,7 @@
 +
 +    private Mode mode;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Operation.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Operation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Operation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Operation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Operation.java
@@ -54549,7 +54549,7 @@
 +    private final Map<String, JClass> faultClassMap = new HashMap<String, JClass>();
 +    private final Map<String, JClass> unmodifiableFaultClassMap = Collections.unmodifiableMap(faultClassMap);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java
@@ -54596,7 +54596,7 @@
 +    private OperationStyle() {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Output.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Output.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Output.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Output.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Output.java
@@ -54750,7 +54750,7 @@
 +        this._action = _action;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Port.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Port.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Port.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Port.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Port.java
@@ -54914,7 +54914,7 @@
 +
 +    private TWSDLExtensible parent;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/PortType.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/PortType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/PortType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/PortType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/PortType.java
@@ -55075,7 +55075,7 @@
 +    private Set _operationKeys;
 +    private ExtensibilityHelper _helper;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Service.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Service.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Service.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Service.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Service.java
@@ -55206,7 +55206,7 @@
 +    private Documentation _documentation;
 +    private List <Port> _ports;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Types.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Types.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Types.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Types.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/Types.java
@@ -55324,7 +55324,7 @@
 +    private ExtensibilityHelper _helper;
 +    private Documentation _documentation;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java
@@ -55388,7 +55388,7 @@
 +
 +    public static QName QNAME_ATTR_ARRAY_TYPE = new QName(NS_WSDL, "arrayType");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java
@@ -55564,7 +55564,7 @@
 +        private EntityReferenceValidator _validator;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java
@@ -55639,7 +55639,7 @@
 +    public void postVisit(Port port) throws Exception;
 +    public void visit(Documentation documentation) throws Exception;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java
@@ -55749,7 +55749,7 @@
 +    public void visit(Documentation documentation) throws Exception {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java
@@ -55817,7 +55817,7 @@
 +
 +    private String _location;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java
@@ -55885,7 +55885,7 @@
 +
 +    private String _verb;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java
@@ -55938,7 +55938,7 @@
 +    public static QName QNAME_URL_REPLACEMENT =
 +        new QName(NS_WSDL_HTTP, "urlReplacement");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java
@@ -56006,7 +56006,7 @@
 +
 +    private String _location;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java
@@ -56061,7 +56061,7 @@
 +    public void validateThis() {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java
@@ -56116,7 +56116,7 @@
 +    public void validateThis() {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java
@@ -56199,7 +56199,7 @@
 +    private String javaDoc;
 +    private String name;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java
@@ -56258,7 +56258,7 @@
 +        this.className = className;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java
@@ -56590,7 +56590,7 @@
 +    //portType WSDLOperation
 +    private CustomName methodName;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java
@@ -56789,7 +56789,7 @@
 +    public static QName XSD_APPINFO = new QName(Constants.NS_XSD, "appinfo");
 +    public static QName XSD_ANNOTATION = new QName(Constants.NS_XSD, "annotation");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java
@@ -56896,7 +56896,7 @@
 +        this.part = part;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java
@@ -56947,7 +56947,7 @@
 +    public static QName QNAME_PART = new QName(NS_WSDL_MIME, "part");
 +    public static QName QNAME_MIME_XML = new QName(NS_WSDL_MIME, "mimeXml");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java
@@ -57021,7 +57021,7 @@
 +    private String _part;
 +    private String _type;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java
@@ -57106,7 +57106,7 @@
 +
 +    private List<MIMEPart> _parts;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java
@@ -57201,7 +57201,7 @@
 +    private String _name;
 +    private ExtensibilityHelper _helper;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java
@@ -57266,7 +57266,7 @@
 +
 +    private String _part;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java
@@ -57422,7 +57422,7 @@
 +    public static QName QNAME_TYPE_SIMPLE_URTYPE =
 +        new QName(NS_XSD, "anySimpleType");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java
@@ -57475,7 +57475,7 @@
 +    private SchemaKinds() {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java
@@ -57519,7 +57519,7 @@
 +        return SOAP12Constants.QNAME_BINDING;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java
@@ -57762,7 +57762,7 @@
 +    public static QName QNAME_ATTR_ID = new QName("", "id");
 +    public static QName QNAME_ATTR_HREF = new QName("", "ref");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java
@@ -57830,7 +57830,7 @@
 +
 +    private String _location;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java
@@ -57913,7 +57913,7 @@
 +    private String _transport;
 +    private SOAPStyle _style;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java
@@ -58013,7 +58013,7 @@
 +    private String _parts;
 +    private SOAPUse _use=SOAPUse.LITERAL;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java
@@ -58277,7 +58277,7 @@
 +    public static final QName QNAME_ATTR_HREF = new QName("", "href");
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java
@@ -58378,7 +58378,7 @@
 +    private String _namespace;
 +    private SOAPUse _use = SOAPUse.LITERAL;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java
@@ -58534,7 +58534,7 @@
 +    private SOAPUse _use=SOAPUse.LITERAL;
 +    private List _faults;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java
@@ -58661,7 +58661,7 @@
 +    private QName _message;
 +    private SOAPUse _use=SOAPUse.LITERAL;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java
@@ -58744,7 +58744,7 @@
 +    private String _soapAction;
 +    private SOAPStyle _style;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java
@@ -58789,7 +58789,7 @@
 +    private SOAPStyle() {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java
@@ -58834,7 +58834,7 @@
 +    private SOAPUse() {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java
@@ -59026,7 +59026,7 @@
 +        private ValidationException _exception;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Defining.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Defining.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Defining.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Defining.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Defining.java
@@ -59066,7 +59066,7 @@
 +public interface Defining extends Elemental {
 +    public String getTargetNamespaceURI();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java
@@ -59129,7 +59129,7 @@
 +        return "com.sun.tools.internal.ws.resources.wsdl";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Elemental.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Elemental.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Elemental.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Elemental.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Elemental.java
@@ -59174,7 +59174,7 @@
 +    public QName getElementName();
 +    public Locator getLocator();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Entity.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Entity.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Entity.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Entity.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Entity.java
@@ -59284,7 +59284,7 @@
 +
 +    private Map _properties;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java
@@ -59324,7 +59324,7 @@
 +public interface EntityAction {
 +    public void perform(Entity entity);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java
@@ -59366,7 +59366,7 @@
 +public interface EntityReferenceAction {
 +    public void perform(Kind kind, QName name);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java
@@ -59409,7 +59409,7 @@
 +public interface EntityReferenceValidator {
 +    public boolean isValid(Kind kind, QName name);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java
@@ -59490,7 +59490,7 @@
 +
 +    private List<TWSDLExtension> _extensions;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java
@@ -59552,7 +59552,7 @@
 +
 +    private TWSDLExtensible _parent;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java
@@ -59595,7 +59595,7 @@
 +    public void preVisit(TWSDLExtension extension) throws Exception;
 +    public void postVisit(TWSDLExtension extension) throws Exception;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java
@@ -59643,7 +59643,7 @@
 +    public void postVisit(TWSDLExtension extension) throws Exception {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java
@@ -59713,7 +59713,7 @@
 +    private Kind _kind;
 +    private QName _name;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java
@@ -59778,7 +59778,7 @@
 +    private Defining _defining;
 +    private String _name;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java
@@ -59820,7 +59820,7 @@
 +    public Kind getKind();
 +    public Defining getDefining();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java
@@ -59860,7 +59860,7 @@
 +public interface Identifiable extends Elemental {
 +    public String getID();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Kind.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Kind.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Kind.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Kind.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/Kind.java
@@ -59909,7 +59909,7 @@
 +
 +    private String _name;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java
@@ -59964,7 +59964,7 @@
 +        return "com.sun.tools.internal.ws.resources.wsdl";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ParseException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ParseException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ParseException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ParseException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ParseException.java
@@ -60022,7 +60022,7 @@
 +        return "com.sun.tools.internal.ws.resources.wsdl";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java
@@ -60065,7 +60065,7 @@
 +    public void ignoringExtension(Entity entity, QName name, QName parent);
 +    public void doneParsingEntity(QName element, Entity entity);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java
@@ -60107,7 +60107,7 @@
 +public interface QNameAction {
 +    public void perform(QName name);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java
@@ -60305,7 +60305,7 @@
 +        return _wsdlLocation.getLocation();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java
@@ -60358,7 +60358,7 @@
 +        return "com.sun.tools.internal.ws.resources.wsdl";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java
@@ -60463,7 +60463,7 @@
 +        private LocationContext parentLocation;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java
@@ -60552,7 +60552,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java
@@ -60667,7 +60667,7 @@
 +        this.locator = locator;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Constants.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Constants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Constants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Constants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Constants.java
@@ -60817,7 +60817,7 @@
 +    public static String TRUE = "true";
 +    public static String FALSE = "false";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java
@@ -60925,7 +60925,7 @@
 +        super.endElement(namespaceURI, localName, qName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
@@ -61405,7 +61405,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java
@@ -61504,7 +61504,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java
@@ -61686,7 +61686,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java
@@ -61907,7 +61907,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java
@@ -62020,7 +62020,7 @@
 +    Element refineWSDLTarget( Element target );
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java
@@ -62539,7 +62539,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java
@@ -63209,7 +63209,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java
@@ -63442,7 +63442,7 @@
 +        return mimeXml;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java
@@ -63515,7 +63515,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java
@@ -63784,7 +63784,7 @@
 +        return root.getDocumentElement();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java
@@ -63904,7 +63904,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java
@@ -64017,7 +64017,7 @@
 +        return SOAP12Constants.QNAME_OPERATION;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java
@@ -64239,7 +64239,7 @@
 +        _validAttributes.add(SOAPConstants.QNAME_ATTR_POSITION);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java
@@ -64728,7 +64728,7 @@
 +        return SOAPConstants.QNAME_BINDING;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Util.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Util.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Util.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Util.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/Util.java
@@ -64914,7 +64914,7 @@
 +        throw new ParseException(key, args);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java
@@ -65056,7 +65056,7 @@
 +    private static final Set<String> VERSIONS = new HashSet<String>(Arrays.asList("2.0","2.1"));
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java
@@ -65200,7 +65200,7 @@
 +        return false; // keep compiler happy
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java
@@ -65351,7 +65351,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java
@@ -66476,7 +66476,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java b/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java
@@ -66604,7 +66604,7 @@
 +        // ignore completely.
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/AbortException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/AbortException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/AbortException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/AbortException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/AbortException.java
@@ -66652,7 +66652,7 @@
 +    public AbortException() {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/BadCommandLineException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/BadCommandLineException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/BadCommandLineException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/BadCommandLineException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/BadCommandLineException.java
@@ -66715,7 +66715,7 @@
 +        return options;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ClassLoaderBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ClassLoaderBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ClassLoaderBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ClassLoaderBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ClassLoaderBuilder.java
@@ -66842,7 +66842,7 @@
 +     */
 +    public static final boolean noHack = Boolean.getBoolean(XJCFacade.class.getName()+".nohack");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ConsoleErrorReporter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ConsoleErrorReporter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ConsoleErrorReporter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ConsoleErrorReporter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ConsoleErrorReporter.java
@@ -66929,7 +66929,7 @@
 +        output.println();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Driver.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Driver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Driver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Driver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Driver.java
@@ -67440,7 +67440,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ErrorReceiver.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ErrorReceiver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ErrorReceiver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ErrorReceiver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ErrorReceiver.java
@@ -67617,7 +67617,7 @@
 +      return url;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Language.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Language.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Language.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Language.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Language.java
@@ -67659,7 +67659,7 @@
 +    RELAXNG_COMPACT,
 +    WSDL
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/MessageBundle.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/MessageBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/MessageBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/MessageBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/MessageBundle.properties
@@ -67913,7 +67913,7 @@
 +PLUGIN_LOAD_FAILURE = \
 +    Failure to load a plugin: "{0}". Use the system property ''-Dcom.sun.tools.internal.xjc.Options.findServices=true'' to \
 +    diagnose it further
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Messages.java
@@ -68105,7 +68105,7 @@
 +    static final String PLUGIN_LOAD_FAILURE = // 1 arg
 +        "PLUGIN_LOAD_FAILURE";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ModelLoader.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ModelLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ModelLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ModelLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ModelLoader.java
@@ -68692,7 +68692,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Options.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Options.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Options.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Options.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Options.java
@@ -69697,7 +69697,7 @@
 +        return Messages.format(Messages.BUILD_ID);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Plugin.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Plugin.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Plugin.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Plugin.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/Plugin.java
@@ -69946,7 +69946,7 @@
 +    public abstract boolean run(
 +        Outline outline, Options opt, ErrorHandler errorHandler ) throws SAXException ;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ProgressCodeWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ProgressCodeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ProgressCodeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ProgressCodeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/ProgressCodeWriter.java
@@ -70025,7 +70025,7 @@
 +        progress.generatedFile(name,current++,totalFileCount);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/SchemaCache.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/SchemaCache.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/SchemaCache.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/SchemaCache.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/SchemaCache.java
@@ -70150,7 +70150,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/XJCFacade.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/XJCFacade.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/XJCFacade.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/XJCFacade.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/XJCFacade.java
@@ -70234,7 +70234,7 @@
 +        return "2.0";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/XJCListener.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/XJCListener.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/XJCListener.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/XJCListener.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/XJCListener.java
@@ -70358,7 +70358,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java
@@ -70478,7 +70478,7 @@
 +        return date;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/code_injector/Const.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/code_injector/Const.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/code_injector/Const.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/code_injector/Const.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/code_injector/Const.java
@@ -70519,7 +70519,7 @@
 +     */
 +    public static final String NS = "http://jaxb.dev.java.net/plugin/code-injector";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java
@@ -70606,7 +70606,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java
@@ -70856,7 +70856,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/episode/package-info.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/episode/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/episode/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/episode/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/episode/package-info.java
@@ -70891,7 +70891,7 @@
 +
 +import com.sun.xml.internal.txw2.annotation.XmlNamespace;
 +import com.sun.tools.internal.xjc.reader.Const;
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java
@@ -70988,7 +70988,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java
@@ -71067,7 +71067,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/ClassNameAllocator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/ClassNameAllocator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/ClassNameAllocator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/ClassNameAllocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/ClassNameAllocator.java
@@ -71135,7 +71135,7 @@
 +     */
 +    String assignClassName( String packageName, String className );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/ErrorListener.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/ErrorListener.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/ErrorListener.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/ErrorListener.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/ErrorListener.java
@@ -71194,7 +71194,7 @@
 +     */
 +    void info(SAXParseException exception);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/J2SJAXBModel.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/J2SJAXBModel.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/J2SJAXBModel.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/J2SJAXBModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/J2SJAXBModel.java
@@ -71281,7 +71281,7 @@
 +     */
 +    void generateEpisodeFile(Result output);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/JAXBModel.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/JAXBModel.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/JAXBModel.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/JAXBModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/JAXBModel.java
@@ -71344,7 +71344,7 @@
 +    List<String> getClassList();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/JavaCompiler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/JavaCompiler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/JavaCompiler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/JavaCompiler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/JavaCompiler.java
@@ -71431,7 +71431,7 @@
 +            String defaultNamespaceRemap,
 +            AnnotationProcessorEnvironment source );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Mapping.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Mapping.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Mapping.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Mapping.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Mapping.java
@@ -71534,7 +71534,7 @@
 +     */
 +    List<? extends Property> getWrapperStyleDrilldown();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Property.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Property.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Property.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Property.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Property.java
@@ -71622,7 +71622,7 @@
 +     */
 +    QName elementName();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Reference.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Reference.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Reference.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Reference.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/Reference.java
@@ -71742,7 +71742,7 @@
 +        return 29 * type.hashCode() + annotations.hashCode();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/S2JJAXBModel.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/S2JJAXBModel.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/S2JJAXBModel.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/S2JJAXBModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/S2JJAXBModel.java
@@ -71859,7 +71859,7 @@
 +     */
 +    JCodeModel generateCode( Plugin[] extensions, ErrorListener errorListener );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/SchemaCompiler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/SchemaCompiler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/SchemaCompiler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/SchemaCompiler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/SchemaCompiler.java
@@ -72117,7 +72117,7 @@
 +     */
 +    @NotNull Options getOptions();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/SpecVersion.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/SpecVersion.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/SpecVersion.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/SpecVersion.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/SpecVersion.java
@@ -72181,7 +72181,7 @@
 +
 +    public static final SpecVersion LATEST = V2_2;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java
@@ -72246,7 +72246,7 @@
 +     */
 +    boolean equals(Object o);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/XJC.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/XJC.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/XJC.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/XJC.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/XJC.java
@@ -72326,7 +72326,7 @@
 +        return NameConverter.standard.toPackageName( namespaceUri );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java
@@ -72526,7 +72526,7 @@
 +        return xsdgen;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java
@@ -72639,7 +72639,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java
@@ -72800,7 +72800,7 @@
 +            parent.outline.getField(p),tagName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java
@@ -72868,7 +72868,7 @@
 +        return buildDrilldown(clazz);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java
@@ -72928,7 +72928,7 @@
 +        core.warning(exception);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java
@@ -73064,7 +73064,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java
@@ -73187,7 +73187,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java
@@ -73283,7 +73283,7 @@
 +        return buildDrilldown(ci);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java
@@ -73376,7 +73376,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java
@@ -73498,7 +73498,7 @@
 +        return classList;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java
@@ -73566,7 +73566,7 @@
 +        return fr.getRawType();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java
@@ -73867,7 +73867,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java
@@ -73985,7 +73985,7 @@
 +        return typeUse.hashCode();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/package.html b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/impl/s2j/package.html
@@ -74017,7 +74017,7 @@
 +<html><body>
 +implementation of the XJC API for schema to java.
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/package.html b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/package.html
@@ -74083,7 +74083,7 @@
 +<p>
 +This package shouldn't contain any implementation code.
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/APTClassLoader.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/APTClassLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/APTClassLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/APTClassLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/APTClassLoader.java
@@ -74235,7 +74235,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java
@@ -74321,7 +74321,7 @@
 +        ; // noop
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/Messages.java
@@ -74373,7 +74373,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/Messages.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/Messages.properties
@@ -74405,7 +74405,7 @@
 +
 +TOOLS_JAR_NOT_FOUND = \
 +    JDK''s tools.jar was not found in {0}. Usually this means you are running JRE, not JDK. Please use the java command in JDK 5.0 or later (not JRE.)
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java
@@ -74461,7 +74461,7 @@
 +        return Messages.TOOLS_JAR_NOT_FOUND.format(toolsJar.getPath());
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/package.html b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/api/util/package.html
@@ -74493,7 +74493,7 @@
 +<html><body>
 +  Utility code shared between JAXB and JAX-WS
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java
@@ -74535,7 +74535,7 @@
 +    OverrideAnnotationOfWriter value(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/XmlIsSetWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/XmlIsSetWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/XmlIsSetWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/XmlIsSetWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/XmlIsSetWriter.java
@@ -74577,7 +74577,7 @@
 +    XmlIsSetWriter value(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/XmlLocationWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/XmlLocationWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/XmlLocationWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/XmlLocationWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/ri/XmlLocationWriter.java
@@ -74617,7 +74617,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java
@@ -74660,7 +74660,7 @@
 +    XmlAccessorOrderWriter value(XmlAccessOrder value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java
@@ -74703,7 +74703,7 @@
 +    XmlAccessorTypeWriter value(XmlAccessType value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java
@@ -74743,7 +74743,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java
@@ -74790,7 +74790,7 @@
 +    XmlAnyElementWriter lax(boolean value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java
@@ -74830,7 +74830,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java
@@ -74876,7 +74876,7 @@
 +    XmlAttributeWriter required(boolean value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java
@@ -74931,7 +74931,7 @@
 +    XmlElementDeclWriter substitutionHeadName(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java
@@ -74982,7 +74982,7 @@
 +    XmlElementRefWriter required(boolean value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java
@@ -75024,7 +75024,7 @@
 +    XmlElementRefWriter value();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java
@@ -75072,7 +75072,7 @@
 +    XmlElementWrapperWriter nillable(boolean value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java
@@ -75127,7 +75127,7 @@
 +    XmlElementWriter nillable(boolean value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java
@@ -75169,7 +75169,7 @@
 +    XmlElementWriter value();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java
@@ -75211,7 +75211,7 @@
 +    XmlEnumValueWriter value(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java
@@ -75256,7 +75256,7 @@
 +    XmlEnumWriter value(JType value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java
@@ -75296,7 +75296,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java
@@ -75336,7 +75336,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java
@@ -75376,7 +75376,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java
@@ -75425,7 +75425,7 @@
 +    XmlJavaTypeAdapterWriter type(JType value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java
@@ -75465,7 +75465,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java
@@ -75507,7 +75507,7 @@
 +    XmlMimeTypeWriter value(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java
@@ -75547,7 +75547,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java
@@ -75591,7 +75591,7 @@
 +    XmlNsWriter namespaceURI(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java
@@ -75631,7 +75631,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java
@@ -75675,7 +75675,7 @@
 +    XmlRootElementWriter namespace(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java
@@ -75724,7 +75724,7 @@
 +    XmlSchemaTypeWriter namespace(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java
@@ -75766,7 +75766,7 @@
 +    XmlSchemaTypeWriter value();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java
@@ -75817,7 +75817,7 @@
 +    XmlSchemaWriter attributeFormDefault(XmlNsForm value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java
@@ -75862,7 +75862,7 @@
 +    XmlSeeAlsoWriter value(JType value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java
@@ -75902,7 +75902,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java
@@ -75955,7 +75955,7 @@
 +    XmlTypeWriter factoryMethod(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java
@@ -75995,7 +75995,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
@@ -76805,7 +76805,7 @@
 +        return name.substring(name.lastIndexOf('.')+1);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java
@@ -76875,7 +76875,7 @@
 +        return _parent;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java
@@ -76955,7 +76955,7 @@
 +        return privateOFG.getObjectFactory();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java
@@ -77064,7 +77064,7 @@
 +        return JExpr._new(codeModel.ref(QName.class)).arg(name.getNamespaceURI()).arg(name.getLocalPart());
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java
@@ -77285,7 +77285,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties
@@ -77333,7 +77333,7 @@
 +
 +OBJECT_FACTORY_CONFLICT_RELATED = \
 +    (Related to above error) This is the other declaration.
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/Messages.java
@@ -77391,7 +77391,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java
@@ -77484,7 +77484,7 @@
 +        return addParameter( codeModel.ref(type), name );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java
@@ -77546,7 +77546,7 @@
 +     */
 +    public abstract JDefinedClass getObjectFactory();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java
@@ -77935,7 +77935,7 @@
 +        return Character.toLowerCase(s.charAt(0)) + s.substring(1);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java
@@ -78197,7 +78197,7 @@
 +        else return XmlNsForm.QUALIFIED;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java
@@ -78273,7 +78273,7 @@
 +        populate(cc,cc.implRef);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java
@@ -78328,7 +78328,7 @@
 +        populate(cc,cc.ref);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java
@@ -78823,7 +78823,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java
@@ -78947,7 +78947,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java
@@ -79176,7 +79176,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java
@@ -79405,7 +79405,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java
@@ -79519,7 +79519,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java
@@ -79580,7 +79580,7 @@
 +            return new ConstField(outline,prop);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java
@@ -79761,7 +79761,7 @@
 +        return codeModel.ref(Serializable.class);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java
@@ -79871,7 +79871,7 @@
 +        return defaultCollectionFieldRenderer;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java
@@ -80028,7 +80028,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java
@@ -80117,7 +80117,7 @@
 +//    public static final FieldRenderer JAXB_DEFAULT
 +//        = new DefaultFieldRenderer();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java
@@ -80217,7 +80217,7 @@
 +    private static final FieldRenderer SINGLE_PRIMITIVE_ACCESS
 +        = new GenericFieldRenderer(SinglePrimitiveAccessField.class);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java
@@ -80292,7 +80292,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java
@@ -80419,7 +80419,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java
@@ -80486,7 +80486,7 @@
 +            generateUnSetMethod,generateIsSetMethod);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties
@@ -80521,7 +80521,7 @@
 +
 +DEFAULT_GETTER_JAVADOC = \
 +        Gets the value of the {0} property.
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/Messages.java
@@ -80574,7 +80574,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java
@@ -80766,7 +80766,7 @@
 +        return codeModel.ref(String.class);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java
@@ -80932,7 +80932,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java
@@ -80977,7 +80977,7 @@
 +        super(context, prop,true);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java
@@ -81102,7 +81102,7 @@
 +        };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java
@@ -81273,7 +81273,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java
@@ -81341,7 +81341,7 @@
 +        return new UntypedListField(context, prop, coreList);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/package.html b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/bean/field/package.html
@@ -81375,7 +81375,7 @@
 +Unless you are deriving from these classes to define your own custom renderer,
 +you shouldn't be using these classes directly. Use the outline package.
 +</p></body>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/package-info.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/package-info.java
@@ -81412,7 +81412,7 @@
 + * classes.
 + */
 +package com.sun.tools.internal.xjc.generator;
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/BlockReference.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/BlockReference.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/BlockReference.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/BlockReference.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/BlockReference.java
@@ -81463,7 +81463,7 @@
 +     */
 +    JBlock get(boolean create);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java
@@ -81513,7 +81513,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java
@@ -81570,7 +81570,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java
@@ -81675,7 +81675,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AbstractCElement.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AbstractCElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AbstractCElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AbstractCElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AbstractCElement.java
@@ -81745,7 +81745,7 @@
 +        isAbstract = true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java
@@ -81861,7 +81861,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java
@@ -81937,7 +81937,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CAdapter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CAdapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CAdapter.java
@@ -82061,7 +82061,7 @@
 +        return adapterClass2;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CArrayInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CArrayInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CArrayInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CArrayInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CArrayInfo.java
@@ -82165,7 +82165,7 @@
 +        return Model.EMPTY_LOCATOR;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java
@@ -82262,7 +82262,7 @@
 +        return  PropertyKind.ATTRIBUTE;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java
@@ -82592,7 +82592,7 @@
 +    public static final TypeUse STRING_LIST =
 +            STRING.makeCollection();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClass.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClass.java
@@ -82633,7 +82633,7 @@
 +    // how can anything be CNonElement and CElement at the same time, you may ask.
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassInfo.java
@@ -83133,7 +83133,7 @@
 +        return fullName();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassInfoParent.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassInfoParent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassInfoParent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassInfoParent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassInfoParent.java
@@ -83221,7 +83221,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassRef.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassRef.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassRef.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CClassRef.java
@@ -83360,7 +83360,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CCustomizable.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CCustomizable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CCustomizable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CCustomizable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CCustomizable.java
@@ -83431,7 +83431,7 @@
 +     */
 +    XSComponent getSchemaComponent();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CCustomizations.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CCustomizations.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CCustomizations.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CCustomizations.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CCustomizations.java
@@ -83580,7 +83580,7 @@
 +        return System.identityHashCode(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CDefaultValue.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CDefaultValue.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CDefaultValue.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CDefaultValue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CDefaultValue.java
@@ -83640,7 +83640,7 @@
 +        };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElement.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElement.java
@@ -83692,7 +83692,7 @@
 +     */
 +    boolean isAbstract();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElementInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElementInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElementInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElementInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElementInfo.java
@@ -83994,7 +83994,7 @@
 +        return className!=null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java
@@ -84212,7 +84212,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CEnumConstant.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CEnumConstant.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CEnumConstant.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CEnumConstant.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CEnumConstant.java
@@ -84298,7 +84298,7 @@
 +        return locator;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java
@@ -84579,7 +84579,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CNonElement.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CNonElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CNonElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CNonElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CNonElement.java
@@ -84643,7 +84643,7 @@
 +    @Deprecated
 +    CAdapter getAdapterUse();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPluginCustomization.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPluginCustomization.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPluginCustomization.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPluginCustomization.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPluginCustomization.java
@@ -84728,7 +84728,7 @@
 +        return acknowledged;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPropertyInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPropertyInfo.java
@@ -85067,7 +85067,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPropertyVisitor.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPropertyVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPropertyVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPropertyVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CPropertyVisitor.java
@@ -85115,7 +85115,7 @@
 +    V onValue( CValuePropertyInfo p );
 +    V onReference( CReferencePropertyInfo p );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java
@@ -85359,7 +85359,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java
@@ -85459,7 +85459,7 @@
 +        return this;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CTypeInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CTypeInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CTypeInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CTypeInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CTypeInfo.java
@@ -85518,7 +85518,7 @@
 +     */
 +    JType toType(Outline o, Aspect aspect);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CTypeRef.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CTypeRef.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CTypeRef.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CTypeRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CTypeRef.java
@@ -85648,7 +85648,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java
@@ -85708,7 +85708,7 @@
 +        return visitor.onValue(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java
@@ -85777,7 +85777,7 @@
 +        return Model.EMPTY_LOCATOR;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java
@@ -85847,7 +85847,7 @@
 +        return className;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Constructor.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Constructor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Constructor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Constructor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Constructor.java
@@ -85916,7 +85916,7 @@
 +    /** array of field names to be initialized. */
 +    public final String[] fields;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Model.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Model.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Model.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Model.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Model.java
@@ -86412,7 +86412,7 @@
 +        EMPTY_LOCATOR = l;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Multiplicity.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Multiplicity.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Multiplicity.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Multiplicity.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Multiplicity.java
@@ -86611,7 +86611,7 @@
 +        return create(min,null);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Populatable.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Populatable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Populatable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Populatable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/Populatable.java
@@ -86660,7 +86660,7 @@
 +public interface Populatable {
 +    public void populate( Model model, Outline context );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/SymbolSpace.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/SymbolSpace.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/SymbolSpace.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/SymbolSpace.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/SymbolSpace.java
@@ -86744,7 +86744,7 @@
 +        else            return type.name();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUse.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUse.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUse.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUse.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUse.java
@@ -86856,7 +86856,7 @@
 +     */
 +    JExpression createConstant(Outline outline, XmlString lexical);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUseFactory.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUseFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUseFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUseFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUseFactory.java
@@ -86943,7 +86943,7 @@
 +        return adapt( t, new CAdapter(adapter,copy) );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUseImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUseImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUseImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUseImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/TypeUseImpl.java
@@ -87077,7 +87077,7 @@
 +        return JExpr._new(adapter.getAdapterClass(outline)).invoke("unmarshal").arg(cons);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/EagerNClass.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/EagerNClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/EagerNClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/EagerNClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/EagerNClass.java
@@ -87155,7 +87155,7 @@
 +        boxedTypes.add(Double.class);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/EagerNType.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/EagerNType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/EagerNType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/EagerNType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/EagerNType.java
@@ -87234,7 +87234,7 @@
 +        return Navigator.REFLECTION.getTypeName(t);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NClass.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NClass.java
@@ -87278,7 +87278,7 @@
 +
 +    boolean isAbstract();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java
@@ -87340,7 +87340,7 @@
 +        return clazz.fullName();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java
@@ -87423,7 +87423,7 @@
 +        return buf.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NType.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NType.java
@@ -87505,7 +87505,7 @@
 +     */
 +    String fullName();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java
@@ -87836,7 +87836,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/package.html b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/package.html
@@ -87880,7 +87880,7 @@
 +    For this reason, inside the front end, we always use the boxed types. We'll use the unboxed
 +    form only in the back end when we know the field doesn't need to represent the null value.
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/package-info.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/package-info.java
@@ -87946,7 +87946,7 @@
 +import com.sun.xml.internal.xsom.XSComponent;
 +
 +import org.xml.sax.Locator;
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/Aspect.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/Aspect.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/Aspect.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/Aspect.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/Aspect.java
@@ -88015,7 +88015,7 @@
 +     */
 +    IMPLEMENTATION
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/ClassOutline.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/ClassOutline.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/ClassOutline.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/ClassOutline.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/ClassOutline.java
@@ -88145,7 +88145,7 @@
 +        return parent().getClazz(s);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/ElementOutline.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/ElementOutline.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/ElementOutline.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/ElementOutline.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/ElementOutline.java
@@ -88222,7 +88222,7 @@
 +        this.implClass = implClass;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java
@@ -88285,7 +88285,7 @@
 +        this.constRef = constRef;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/EnumOutline.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/EnumOutline.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/EnumOutline.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/EnumOutline.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/EnumOutline.java
@@ -88367,7 +88367,7 @@
 +        this.clazz = clazz;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/FieldAccessor.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/FieldAccessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/FieldAccessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/FieldAccessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/FieldAccessor.java
@@ -88475,7 +88475,7 @@
 +     */
 +    CPropertyInfo getPropertyInfo();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/FieldOutline.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/FieldOutline.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/FieldOutline.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/FieldOutline.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/FieldOutline.java
@@ -88549,7 +88549,7 @@
 +     */
 +    FieldAccessor create( JExpression targetObject );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/Outline.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/Outline.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/Outline.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/Outline.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/Outline.java
@@ -88686,7 +88686,7 @@
 +     */
 +    JClass addRuntime(Class clazz);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/PackageOutline.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/PackageOutline.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/PackageOutline.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/PackageOutline.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/PackageOutline.java
@@ -88786,7 +88786,7 @@
 +    public XmlNsForm getElementFormDefault();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/package.html b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/outline/package.html
@@ -88824,7 +88824,7 @@
 +  Code generation phase builds an outline little by little, while
 +  each step is using the outline built by the prior steps.
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/package-info.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/package-info.java
@@ -88919,7 +88919,7 @@
 + * @ArchitectureDocument
 + */
 +package com.sun.tools.internal.xjc;
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java
@@ -89127,7 +89127,7 @@
 +        getErrorHandler().warning(spe);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Const.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Const.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Const.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Const.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Const.java
@@ -89196,7 +89196,7 @@
 +     */
 +    public static final String EXPECTED_CONTENT_TYPES = "expectedContentTypes";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java
@@ -89336,7 +89336,7 @@
 +        super.startElement(namespaceURI, localName, qName, atts);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/MessageBundle.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/MessageBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/MessageBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/MessageBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/MessageBundle.properties
@@ -89414,7 +89414,7 @@
 +
 +ERR_PLUGIN_NOT_ENABLED = \
 +    Using "{1}" customizations requires the "-{0}" switch to enable this plug-in.
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Messages.java
@@ -89478,7 +89478,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/ModelChecker.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/ModelChecker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/ModelChecker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/ModelChecker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/ModelChecker.java
@@ -89581,7 +89581,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/RawTypeSet.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/RawTypeSet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/RawTypeSet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/RawTypeSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/RawTypeSet.java
@@ -89812,7 +89812,7 @@
 +        protected MimeType getExpectedMimeType() { return null; }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Ring.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Ring.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Ring.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Ring.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Ring.java
@@ -89949,7 +89949,7 @@
 +        instances.set(old);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/TypeUtil.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/TypeUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/TypeUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/TypeUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/TypeUtil.java
@@ -90220,7 +90220,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Util.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Util.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Util.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Util.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/Util.java
@@ -90304,7 +90304,7 @@
 +        return buf.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Block.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Block.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Block.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Block.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Block.java
@@ -90359,7 +90359,7 @@
 +        isRepeated = repeated;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Element.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Element.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Element.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Element.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Element.java
@@ -90678,7 +90678,7 @@
 +        return this.name.compareTo(that.name);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties
@@ -90731,7 +90731,7 @@
 +TDTDReader.BindInfo.NonExistentInterfaceMember = \
 +        "{0}" is specified as a member of an interface, \
 +        but there is no such class nor interface.
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Messages.java
@@ -90800,7 +90800,7 @@
 +        "TDTDReader.BindInfo.NonExistentInterfaceMember";
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java
@@ -90943,7 +90943,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Occurence.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Occurence.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Occurence.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Occurence.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Occurence.java
@@ -91031,7 +91031,7 @@
 +        return isRepeated||term.isRepeated();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java
@@ -91498,7 +91498,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Term.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Term.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Term.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Term.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/Term.java
@@ -91565,7 +91565,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java
@@ -91676,7 +91676,7 @@
 +        else            return name();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java
@@ -91770,7 +91770,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java
@@ -91912,7 +91912,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java
@@ -91956,7 +91956,7 @@
 +    /** Gets a transducer for this conversion. */
 +    TypeUse getTransducer();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java
@@ -92233,7 +92233,7 @@
 +        return DOMLocator.getLocationInfo(e);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java
@@ -92349,7 +92349,7 @@
 +        return r;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java
@@ -92449,7 +92449,7 @@
 +        return r;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java
@@ -92679,7 +92679,7 @@
 +        return adapter;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java
@@ -93015,7 +93015,7 @@
 +        throw new AbortException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java
@@ -93073,7 +93073,7 @@
 +        DOMLocator.setLocationInfo(getCurrentElement(),locator);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java
@@ -93148,7 +93148,7 @@
 +        };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java
@@ -93261,7 +93261,7 @@
 +        return r;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java
@@ -93355,7 +93355,7 @@
 +        super.startElement(uri, localName, qName, atts);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties
@@ -93388,7 +93388,7 @@
 +BIConstructor.UndefinedField = \
 +        Property "{0}" is declared in the <constructor> declaration \
 +        but is not defined in DTD
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java
@@ -93439,7 +93439,7 @@
 +        "BIConstructor.UndefinedField";
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng
@@ -93760,7 +93760,7 @@
 +    <ref name="java.name.datatype"/>
 +  </define>
 +</grammar>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd
@@ -94037,7 +94037,7 @@
 +    <xs:restriction base="java.name.datatype"/>
 +  </xs:simpleType>
 +</xs:schema>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package.html b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package.html
@@ -94067,7 +94067,7 @@
 + questions.
 +-->
 +<body><p>Object Model that represents DTD binding information.</p></body>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd
@@ -94124,7 +94124,7 @@
 +    <xs:complexType/>
 +  </xs:element>
 +</xs:schema>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Choice.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Choice.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Choice.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Choice.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Choice.java
@@ -94198,7 +94198,7 @@
 +        return '('+lhs.toString()+'|'+rhs.toString()+')';
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java
@@ -94301,7 +94301,7 @@
 +        return s;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Element.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Element.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Element.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Element.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Element.java
@@ -94534,7 +94534,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java
@@ -94602,7 +94602,7 @@
 +     */
 +    boolean contains(ElementSet rhs);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java
@@ -94691,7 +94691,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Expression.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Expression.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Expression.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Expression.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Expression.java
@@ -94768,7 +94768,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Graph.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Graph.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Graph.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Graph.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Graph.java
@@ -94861,7 +94861,7 @@
 +        return ccs.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java
@@ -94924,7 +94924,7 @@
 +        return child.toString()+'+';
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Sequence.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Sequence.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Sequence.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Sequence.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/Sequence.java
@@ -95014,7 +95014,7 @@
 +        return '('+lhs.toString()+','+rhs.toString()+')';
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java
@@ -95060,7 +95060,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java
@@ -95106,7 +95106,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/package.html b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/gbind/package.html
@@ -95140,7 +95140,7 @@
 +    Binary expressions are left-associative. IOW, ((A,B),C) instead of (A,(B,C))
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java
@@ -95258,7 +95258,7 @@
 +        this.locator = locator;
 +    }
 +};
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java
@@ -95373,7 +95373,7 @@
 +    private static final String PREFIX_FEATURE = "http://xml.org/sax/features/namespace-prefixes";
 +    private static final String NAMESPACE_FEATURE = "http://xml.org/sax/features/namespaces";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java
@@ -95479,7 +95479,7 @@
 +        super.endElement(namespaceURI, localName, qName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java
@@ -96065,7 +96065,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java
@@ -96160,7 +96160,7 @@
 +        scanner.scan( dom, contentHandler );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java
@@ -96343,7 +96343,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java
@@ -96441,7 +96441,7 @@
 +     */
 +    Element refineTarget( Element target );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java
@@ -96941,7 +96941,7 @@
 +        errorHandler.error(e);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java
@@ -97008,7 +97008,7 @@
 +        return (Locator)endLocations.get(e);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties
@@ -97106,7 +97106,7 @@
 +
 +ERR_FILENAME_IS_NOT_URI = \
 +    File name is not an URI.
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/Messages.java
@@ -97193,7 +97193,7 @@
 +    static final String ERR_GENERAL_SCHEMA_CORRECTNESS_ERROR = // arg:1
 +        "ERR_GENERAL_SCHEMA_CORRECTNESS_ERROR";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java
@@ -97323,7 +97323,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java
@@ -97574,7 +97574,7 @@
 +        errorReceiver.error(e);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java
@@ -97717,7 +97717,7 @@
 +    private static final Set<String> VERSIONS = new HashSet<String>(Arrays.asList("1.0","2.0","2.1"));
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java
@@ -97848,7 +97848,7 @@
 +        // ignore completely.
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/package.html b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/internalizer/package.html
@@ -97878,7 +97878,7 @@
 + questions.
 +-->
 +<body><p>internalization of external binding files and &lt;jaxb:bindings> customizations.</p></body>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/package.html b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/package.html
@@ -97908,7 +97908,7 @@
 + questions.
 +-->
 +<body><p>Front-end that reads schema(s) and produce BGM.</p></body>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java
@@ -97946,7 +97946,7 @@
 +enum BindStyle {
 +    TYPE, ELEMENT
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java
@@ -98081,7 +98081,7 @@
 +        return "field"+(iota++);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java
@@ -98162,7 +98162,7 @@
 +        XMLSCHEMA.types.putAll(SimpleTypeBuilder.builtinConversions);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java
@@ -98228,7 +98228,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java
@@ -98268,7 +98268,7 @@
 + */
 +class NameCalculator extends DPatternWalker {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java
@@ -98543,7 +98543,7 @@
 +//        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java
@@ -98623,7 +98623,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java
@@ -98765,7 +98765,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java
@@ -98910,7 +98910,7 @@
 +        canInherit = stack.pop();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java
@@ -99087,7 +99087,7 @@
 +        throw new IllegalStateException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java
@@ -99147,7 +99147,7 @@
 +        return ci;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java
@@ -99716,7 +99716,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java
@@ -99828,7 +99828,7 @@
 +        throw new IllegalStateException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java
@@ -99964,7 +99964,7 @@
 +        throw new IllegalStateException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java
@@ -100117,7 +100117,7 @@
 +        // empty generates nothing
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java
@@ -100224,7 +100224,7 @@
 +        throw new IllegalStateException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java
@@ -100325,7 +100325,7 @@
 +        throw new IllegalStateException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java
@@ -100382,7 +100382,7 @@
 +        return Ring.get(ClassSelector.class);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java
@@ -100427,7 +100427,7 @@
 + */
 +interface ClassBinder extends XSFunction<CElement> {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java
@@ -100558,7 +100558,7 @@
 +        return core.xpath(xsxPath);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java
@@ -101047,7 +101047,7 @@
 +        return Ring.get(JCodeModel.class)._package(name);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java
@@ -101119,7 +101119,7 @@
 +            return sysId;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java
@@ -101217,7 +101217,7 @@
 +        throw new IllegalStateException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java
@@ -101750,7 +101750,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java
@@ -102146,7 +102146,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java
@@ -102259,7 +102259,7 @@
 +//    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java
@@ -102397,7 +102397,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java
@@ -102545,7 +102545,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java
@@ -102599,7 +102599,7 @@
 +     */
 +    abstract String getPropertyNameSeed();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java
@@ -102671,7 +102671,7 @@
 +        return tagName.getLocalPart();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java
@@ -102740,7 +102740,7 @@
 +        return strict;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties
@@ -102930,7 +102930,7 @@
 +
 +ERR_REFERENCE_TO_NONEXPORTED_CLASS_REFERER = \
 +    (related to above) The problematic schema component is referenced from this component: {0}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java
@@ -103087,7 +103087,7 @@
 +    public static final String ERR_REFERENCE_TO_NONEXPORTED_CLASS_REFERER =
 +        "ERR_REFERENCE_TO_NONEXPORTED_CLASS_REFERER";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java
@@ -103186,7 +103186,7 @@
 +        return ONE;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java
@@ -103445,7 +103445,7 @@
 +        return Ring.get(ClassSelector.class);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java
@@ -103828,7 +103828,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java
@@ -103987,7 +103987,7 @@
 +        r.add(source);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java
@@ -104897,7 +104897,7 @@
 +//            "date", "dateTime", "time", "hexBinary" };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java
@@ -105168,7 +105168,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java
@@ -105256,7 +105256,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java
@@ -105347,7 +105347,7 @@
 +        isAcknowledged = true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java
@@ -105509,7 +105509,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java
@@ -105637,7 +105637,7 @@
 +    /** Name of this declaration. */
 +    public static final QName NAME = new QName( Const.JAXB_NSURI, "class" );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java
@@ -105990,7 +105990,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java
@@ -106099,7 +106099,7 @@
 +     */
 +    Collection<BIDeclaration> getChildren();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java
@@ -106154,7 +106154,7 @@
 +    /** Name of the conversion declaration. */
 +    public static final QName NAME = new QName(Const.JAXB_NSURI,"dom");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java
@@ -106287,7 +106287,7 @@
 +        String value;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java
@@ -106357,7 +106357,7 @@
 +    public static final QName NAME = new QName(
 +        Const.JAXB_NSURI, "typesafeEnumMember" );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java
@@ -106426,7 +106426,7 @@
 +    /** Name of the declaration. */
 +    public static final QName NAME = new QName(Const.JAXB_NSURI,"factoryMethod");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java
@@ -106935,7 +106935,7 @@
 +        QName xmlType;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java
@@ -107002,7 +107002,7 @@
 +    /** Name of the declaration. */
 +    public static final QName NAME = new QName(Const.JAXB_NSURI,"inlineBinaryData");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java
@@ -107760,7 +107760,7 @@
 +        String name;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java
@@ -107922,7 +107922,7 @@
 +    public static final QName NAME = new QName(
 +        Const.JAXB_NSURI, "schemaBinding" );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java
@@ -107970,7 +107970,7 @@
 +    @XmlAttribute
 +    public Long uid;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java
@@ -108021,7 +108021,7 @@
 +    @XmlAttribute
 +    String type = "w3c";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java
@@ -108093,7 +108093,7 @@
 +        return name;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java
@@ -108146,7 +108146,7 @@
 +    /** Name of the conversion declaration. */
 +    public static final QName NAME = new QName(Const.XJC_EXTENSION_URI,"substitutable");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java
@@ -108498,7 +108498,7 @@
 +     */
 +    public static final SchemaCache bindingFileSchema = new SchemaCache(BindInfo.class.getResource("binding.xsd"));
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java
@@ -108569,7 +108569,7 @@
 +        return frf.getList(m.codeModel.ref(collectionType));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java
@@ -108670,7 +108670,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java
@@ -108729,7 +108729,7 @@
 +        return this;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java
@@ -108903,7 +108903,7 @@
 +        super.ignorableWhitespace(ch, start, length);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java
@@ -108946,7 +108946,7 @@
 +    @XmlEnumValue("toplevel")
 +    TOPLEVEL
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties
@@ -109003,7 +109003,7 @@
 +
 +ERR_CANNOT_BE_BOUND_TO_SIMPLETYPE = \
 +    Simple type "{0}" is not allowed by the spec to be bound to a type-safe enum.
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java
@@ -109054,7 +109054,7 @@
 +        return MessageFormat.format(text,args);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java
@@ -109101,7 +109101,7 @@
 +    @XmlEnumValue("isSet")
 +    ISSET
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng
@@ -110017,7 +110017,7 @@
 +    </define>
 +  </p:ignore>
 +</grammar>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd
@@ -110349,7 +110349,7 @@
 +    <xs:anyAttribute processContents="skip"/>
 +  </xs:attributeGroup>
 +</xs:schema>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java
@@ -110387,7 +110387,7 @@
 +import com.sun.tools.internal.xjc.reader.Const;
 +
 +import static javax.xml.bind.annotation.XmlNsForm.QUALIFIED;
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html
@@ -110425,7 +110425,7 @@
 +        this object model.
 +</p>
 +</body>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd
@@ -110539,7 +110539,7 @@
 +    </xs:complexType>
 +  </xs:element>
 +</xs:schema>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd
@@ -110600,7 +110600,7 @@
 +    </xs:complexType>
 +  </xs:element>
 +</xs:schema>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java
@@ -110826,7 +110826,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java
@@ -110900,7 +110900,7 @@
 +    protected final XSSchemaSet schemas = Ring.get(XSSchemaSet.class);
 +    protected final BGMBuilder bgmBuilder = Ring.get(BGMBuilder.class);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java
@@ -110995,7 +110995,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java
@@ -111065,7 +111065,7 @@
 +//     */
 +//    static final ComplexTypeBindingMode NOMOREEXTENSION = new ComplexTypeBindingMode("noMoreExtension");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java
@@ -111175,7 +111175,7 @@
 +        return r;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java
@@ -111277,7 +111277,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java
@@ -111375,7 +111375,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties
@@ -111409,7 +111409,7 @@
 +    Base complex type "{0}" is derived by restriction, while this complex type "{1}" \
 +    is derived by extension. This is not currently handled by XJC, but we are \
 +    seeking input on this issue. Please report this to the JAXB team.
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java
@@ -111460,7 +111460,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java
@@ -111579,7 +111579,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java
@@ -111676,7 +111676,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java
@@ -111775,7 +111775,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java
@@ -111850,7 +111850,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java
@@ -112048,7 +112048,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java
@@ -112170,7 +112170,7 @@
 +        this.locator = locator;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java
@@ -112285,7 +112285,7 @@
 +        // no-op
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties
@@ -112337,7 +112337,7 @@
 +IncorrectNamespaceURIChecker.WarnIncorrectURI = \
 +        No JAXB customization was detected in the schema but the prefix "jaxb" is used for \
 +        other namespace URIs. If you did intend to use JAXB customization, make sure the namespace URI is "{0}"
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java
@@ -112394,7 +112394,7 @@
 +    static final String WARN_UNABLE_TO_CHECK_CORRECTNESS = // 0 args
 +        "SchemaConstraintChecker.UnableToCheckCorrectness";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java
@@ -112522,7 +112522,7 @@
 +        check(sources, new ConsoleErrorReporter(), null);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java
@@ -112641,7 +112641,7 @@
 +        return child;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java
@@ -112802,7 +112802,7 @@
 +        return JAXBContext.newInstance(classes.toArray(new Class[classes.size()]),properties);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java
@@ -112858,7 +112858,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/package.html b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/runtime/package.html
@@ -112891,7 +112891,7 @@
 +  Code generated into the user's packages in certain compilation mode.
 +
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java
@@ -113038,7 +113038,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/DOMUtils.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/DOMUtils.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/DOMUtils.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/DOMUtils.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/DOMUtils.java
@@ -113203,7 +113203,7 @@
 +        return elements;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java
@@ -113282,7 +113282,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ForkContentHandler.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ForkContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ForkContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ForkContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ForkContentHandler.java
@@ -113415,7 +113415,7 @@
 +        }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ForkEntityResolver.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ForkEntityResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ForkEntityResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ForkEntityResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ForkEntityResolver.java
@@ -113474,7 +113474,7 @@
 +        return rhs.resolveEntity(publicId,systemId);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/MessageBundle.properties b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/MessageBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/MessageBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/MessageBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/MessageBundle.properties
@@ -113531,7 +113531,7 @@
 +    "chameleon schema", which causes a single definition to be loaded multiple times into \
 +    different namespaces. See http://forums.java.net/jive/thread.jspa?threadID=18631 for \
 +    more about this.
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/Messages.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/Messages.java
@@ -113593,7 +113593,7 @@
 +    static final String ERR_CHAMELEON_SCHEMA_GONE_WILD = // no argts
 +        "ERR_CHAMELEON_SCHEMA_GONE_WILD";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/MimeTypeRange.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/MimeTypeRange.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/MimeTypeRange.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/MimeTypeRange.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/MimeTypeRange.java
@@ -113763,7 +113763,7 @@
 +            System.out.println(m.toString());
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java
@@ -113828,7 +113828,7 @@
 +        return Collections.EMPTY_LIST.iterator();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/NullStream.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/NullStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/NullStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/NullStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/NullStream.java
@@ -113885,7 +113885,7 @@
 +    public void write(byte[] b) throws IOException {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java
@@ -113932,7 +113932,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/StringCutter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/StringCutter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/StringCutter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/StringCutter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/StringCutter.java
@@ -114034,7 +114034,7 @@
 +        return s.length();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/SubtreeCutter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/SubtreeCutter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/SubtreeCutter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/SubtreeCutter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/SubtreeCutter.java
@@ -114147,7 +114147,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/Util.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/Util.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/Util.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/Util.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/util/Util.java
@@ -114227,7 +114227,7 @@
 +        return getSystemProperty( clazz.getName()+'.'+name );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/writer/SignatureWriter.java b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/writer/SignatureWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/writer/SignatureWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/writer/SignatureWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/writer/SignatureWriter.java
@@ -114394,7 +114394,7 @@
 +        return name;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AccessorFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AccessorFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AccessorFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AccessorFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AccessorFactory.java
@@ -114460,7 +114460,7 @@
 +     */
 +    Accessor createPropertyAccessor(Class bean, Method getter, Method setter) throws JAXBException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AccessorFactoryImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AccessorFactoryImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AccessorFactoryImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AccessorFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AccessorFactoryImpl.java
@@ -114544,7 +114544,7 @@
 +        return new Accessor.GetterSetterReflection(getter, setter);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AnyTypeAdapter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AnyTypeAdapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AnyTypeAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AnyTypeAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/AnyTypeAdapter.java
@@ -114602,7 +114602,7 @@
 +        return v;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/CycleRecoverable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/CycleRecoverable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/CycleRecoverable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/CycleRecoverable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/CycleRecoverable.java
@@ -114689,7 +114689,7 @@
 +        Marshaller getMarshaller();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/DatatypeConverterImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/DatatypeConverterImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/DatatypeConverterImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/DatatypeConverterImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/DatatypeConverterImpl.java
@@ -115611,7 +115611,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/IDResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/IDResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/IDResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/IDResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/IDResolver.java
@@ -115776,7 +115776,7 @@
 +     */
 +    public abstract Callable<?> resolve( String id, Class targetType ) throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/Locatable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/Locatable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/Locatable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/Locatable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/Locatable.java
@@ -115833,7 +115833,7 @@
 +     */
 +    Locator sourceLocation();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/Util.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/Util.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/Util.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/Util.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/Util.java
@@ -115899,7 +115899,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/ValidationEventLocatorEx.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/ValidationEventLocatorEx.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/ValidationEventLocatorEx.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/ValidationEventLocatorEx.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/ValidationEventLocatorEx.java
@@ -115974,7 +115974,7 @@
 +     */
 +    String getFieldName();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/WhiteSpaceProcessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/WhiteSpaceProcessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/WhiteSpaceProcessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/WhiteSpaceProcessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/WhiteSpaceProcessor.java
@@ -116176,7 +116176,7 @@
 +        return ch == 0x9 || ch == 0xA || ch == 0xD;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/XmlAccessorFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/XmlAccessorFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/XmlAccessorFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/XmlAccessorFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/XmlAccessorFactory.java
@@ -116224,7 +116224,7 @@
 +public @interface XmlAccessorFactory {
 +    Class<? extends AccessorFactory> value();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java
@@ -116271,7 +116271,7 @@
 +public @interface OverrideAnnotationOf {
 +    String value() default "content";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/XmlIsSet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/XmlIsSet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/XmlIsSet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/XmlIsSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/XmlIsSet.java
@@ -116389,7 +116389,7 @@
 +     */
 +    String value();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/XmlLocation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/XmlLocation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/XmlLocation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/XmlLocation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/annotation/XmlLocation.java
@@ -116462,7 +116462,7 @@
 +@Retention(RUNTIME) @Target({FIELD,METHOD})
 +public @interface XmlLocation {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/AccessorException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/AccessorException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/AccessorException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/AccessorException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/AccessorException.java
@@ -116529,7 +116529,7 @@
 +        super(cause);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Bridge.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Bridge.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Bridge.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Bridge.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Bridge.java
@@ -116854,7 +116854,7 @@
 +     */
 +    public abstract TypeReference getTypeReference();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/BridgeContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/BridgeContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/BridgeContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/BridgeContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/BridgeContext.java
@@ -116957,7 +116957,7 @@
 +     */
 +    public abstract AttachmentUnmarshaller getAttachmentUnmarshaller();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/ClassResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/ClassResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/ClassResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/ClassResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/ClassResolver.java
@@ -117066,7 +117066,7 @@
 +     */
 +    public abstract @Nullable Class<?> resolveElementName(@NotNull String nsUri, @NotNull String localName) throws Exception;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/CompositeStructure.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/CompositeStructure.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/CompositeStructure.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/CompositeStructure.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/CompositeStructure.java
@@ -117122,7 +117122,7 @@
 +    public Bridge[] bridges;
 +    public Object[] values;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/ErrorListener.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/ErrorListener.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/ErrorListener.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/ErrorListener.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/ErrorListener.java
@@ -117183,7 +117183,7 @@
 +     */
 +    void info(SAXParseException exception);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/JAXBRIContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/JAXBRIContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/JAXBRIContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/JAXBRIContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/JAXBRIContext.java
@@ -117643,7 +117643,7 @@
 +    public static final String RETAIN_REFERENCE_TO_INFO = "retainReferenceToInfo";
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Messages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Messages.java
@@ -117701,7 +117701,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/Messages.properties
@@ -117733,7 +117733,7 @@
 +
 +ARGUMENT_CANT_BE_NULL = \
 +    Argument(s) "{0}" can''t be null.
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/RawAccessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/RawAccessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/RawAccessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/RawAccessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/RawAccessor.java
@@ -117811,7 +117811,7 @@
 +     */
 +    public abstract void set(B bean,V value) throws AccessorException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/TypeReference.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/TypeReference.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/TypeReference.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/TypeReference.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/TypeReference.java
@@ -117930,7 +117930,7 @@
 +            Navigator.REFLECTION.getTypeArgument(base,0));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/impl/NameConverter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/impl/NameConverter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/impl/NameConverter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/impl/NameConverter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/impl/NameConverter.java
@@ -118206,7 +118206,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/impl/NameUtil.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/impl/NameUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/impl/NameUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/impl/NameUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/impl/NameUtil.java
@@ -118639,7 +118639,7 @@
 +            reservedKeywords.add(word);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/api/package-info.java
@@ -118684,7 +118684,7 @@
 + * So the compatibility of this API has to be managed carefully.
 + */
 +package com.sun.xml.internal.bind.api;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java
@@ -118737,7 +118737,7 @@
 +    void escape( char[] ch, int start, int length, boolean isAttVal, Writer out ) throws IOException;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/DataWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/DataWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/DataWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/DataWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/DataWriter.java
@@ -119119,7 +119119,7 @@
 +}
 +
 +// end of DataWriter.java
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java
@@ -119202,7 +119202,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/Messages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/Messages.java
@@ -119316,7 +119316,7 @@
 +    public static final String DOM_IMPL_DOESNT_SUPPORT_CREATELEMENTNS = // 2 args
 +        "SAX2DOMEx.DomImplDoesntSupportCreateElementNs";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/Messages.properties
@@ -119379,7 +119379,7 @@
 +
 +SAX2DOMEx.DomImplDoesntSupportCreateElementNs = \
 +        DOM implementation ({0} from {1}) is broken. It does not support the createElementNS method.
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java
@@ -119459,7 +119459,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java
@@ -119721,7 +119721,7 @@
 +        return EMPTY_STRING;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java
@@ -119820,7 +119820,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java
@@ -120030,7 +120030,7 @@
 +    public void endPrefixMapping(String prefix) {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/XMLWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/XMLWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/XMLWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/XMLWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/marshaller/XMLWriter.java
@@ -121011,7 +121011,7 @@
 +}
 +
 +// end of XMLWriter.java
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java
@@ -121331,7 +121331,7 @@
 +        return new ValidationEventLocatorImpl(getCurrentLocation());
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java
@@ -121433,7 +121433,7 @@
 +
 +    LocatorEx getLocator();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Messages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Messages.java
@@ -121538,7 +121538,7 @@
 +        "Unmarshaller.IllegalReaderState";
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Messages.properties
@@ -121604,7 +121604,7 @@
 +
 +Unmarshaller.IllegalReaderState = \
 +        reader must be on a START_ELEMENT event, not a {0} event
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Patcher.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Patcher.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Patcher.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Patcher.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/unmarshaller/Patcher.java
@@ -121656,7 +121656,7 @@
 +     */
 +    void run() throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/AttributesImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/AttributesImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/AttributesImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/AttributesImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/AttributesImpl.java
@@ -122315,7 +122315,7 @@
 +}
 +
 +// end of AttributesImpl.java
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java
@@ -122392,7 +122392,7 @@
 +        return buf.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/Which.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/Which.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/Which.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/Which.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/util/Which.java
@@ -122461,7 +122461,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/ClassFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/ClassFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/ClassFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/ClassFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/ClassFactory.java
@@ -122672,7 +122672,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/ContextFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/ContextFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/ContextFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/ContextFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/ContextFactory.java
@@ -122919,7 +122919,7 @@
 +
 +    public static final String USE_JAXB_PROPERTIES = "_useJAXBProperties";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/Messages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/Messages.java
@@ -122977,7 +122977,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/Messages.properties
@@ -123027,7 +123027,7 @@
 +
 +INVALID_TYPE_IN_MAP = \
 +    Map contains a wrong type
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/TODO.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/TODO.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/TODO.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/TODO.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/TODO.java
@@ -123090,7 +123090,7 @@
 +     */
 +    public static void schemaGenerator(String comment) {}
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/WellKnownNamespace.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/WellKnownNamespace.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/WellKnownNamespace.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/WellKnownNamespace.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/WellKnownNamespace.java
@@ -123155,7 +123155,7 @@
 +
 +//    public static final QName XSI_NIL = new QName(XML_SCHEMA_INSTANCE,"nil");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java
@@ -123351,7 +123351,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/bytecode/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/bytecode/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/bytecode/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/bytecode/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/bytecode/package.html
@@ -123385,7 +123385,7 @@
 +  Code that deals with low level byte code manipulation.
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java
@@ -123492,7 +123492,7 @@
 +     */
 +    protected abstract String fullName(M m);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java
@@ -123661,7 +123661,7 @@
 +     */
 +    T[] getClassArrayValue( Annotation a, String name );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java
@@ -123722,7 +123722,7 @@
 +     */
 +    boolean hasAnnotation(Class<? extends Annotation> annotationType);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java
@@ -123781,7 +123781,7 @@
 +        return nav.getClassLocation(clazz);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java
@@ -123840,7 +123840,7 @@
 +        return nav.getFieldLocation(field);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Init.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Init.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Init.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Init.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Init.java
@@ -123880,7 +123880,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java
@@ -123950,7 +123950,7 @@
 +     */
 +    Location getLocation();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java
@@ -124085,7 +124085,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Messages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Messages.java
@@ -124138,7 +124138,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties
@@ -124170,7 +124170,7 @@
 +
 +DUPLICATE_ANNOTATIONS = \
 +    Annotation "{0}" is present on both "{1}" and "{2}"
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java
@@ -124229,7 +124229,7 @@
 +        return nav.getMethodLocation(method);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Quick.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Quick.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Quick.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Quick.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/Quick.java
@@ -124304,7 +124304,7 @@
 +        return getAnnotation().toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java
@@ -124345,7 +124345,7 @@
 + */
 +public interface RuntimeAnnotationReader extends AnnotationReader<Type,Class,Field,Method> {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java
@@ -124501,7 +124501,7 @@
 +        return m.getDeclaringClass().getName()+'#'+m.getName();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java
@@ -124572,7 +124572,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java
@@ -124655,7 +124655,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java
@@ -124738,7 +124738,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java
@@ -124809,7 +124809,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java
@@ -124873,7 +124873,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java
@@ -124936,7 +124936,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java
@@ -125003,7 +125003,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java
@@ -125084,7 +125084,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java
@@ -125155,7 +125155,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java
@@ -125214,7 +125214,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java
@@ -125293,7 +125293,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java
@@ -125352,7 +125352,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/annotation/package.html
@@ -125384,7 +125384,7 @@
 +<html><body>
 +  Abstraction around reading annotations, to support internal/external annotations.
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Adapter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Adapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Adapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Adapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Adapter.java
@@ -125477,7 +125477,7 @@
 +            customType = nav.ref(Object.class);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java
@@ -125528,7 +125528,7 @@
 +     */
 +    NonElement<T,C> getItemType();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java
@@ -125595,7 +125595,7 @@
 +
 +    Adapter<T,C> getAdapter();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java
@@ -125651,7 +125651,7 @@
 +     */
 +    public QName getTypeName();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java
@@ -125838,7 +125838,7 @@
 +     */
 +    boolean declaresAttributeWildcard();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Element.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Element.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Element.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Element.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Element.java
@@ -125904,7 +125904,7 @@
 +     */
 +    ClassInfo<T,C> getScope();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java
@@ -126006,7 +126006,7 @@
 +     */
 +    Collection<? extends ElementInfo<T,C>> getSubstitutionMembers();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java
@@ -126134,7 +126134,7 @@
 +
 +    Adapter<T,C> getAdapter();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java
@@ -126222,7 +126222,7 @@
 +     */
 +    String getName();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java
@@ -126300,7 +126300,7 @@
 +     */
 +    Iterable<? extends EnumConstant> getConstants();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java
@@ -126358,7 +126358,7 @@
 +     */
 +    void error( IllegalAnnotationException e );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ID.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ID.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ID.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ID.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ID.java
@@ -126396,7 +126396,7 @@
 +public enum ID {
 +    ID,IDREF,NONE
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java
@@ -126441,7 +126441,7 @@
 + */
 +public interface LeafInfo<T,C> extends MaybeElement<T,C> {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java
@@ -126547,7 +126547,7 @@
 +    // Adapter<T,C> getKeyAdapter();
 +    // Adapter<T,C> getValueAdapter();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java
@@ -126615,7 +126615,7 @@
 +     */
 +    Element<T,C> asElement();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/NonElement.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/NonElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/NonElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/NonElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/NonElement.java
@@ -126680,7 +126680,7 @@
 +     */
 +    boolean isSimpleType();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java
@@ -126736,7 +126736,7 @@
 +     */
 +    PropertyInfo<T,C> getSource();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java
@@ -126893,7 +126893,7 @@
 +     */
 +    @Nullable QName getSchemaType();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java
@@ -126971,7 +126971,7 @@
 +        this.propertyIndex = propertyIndex;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Ref.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Ref.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Ref.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Ref.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/Ref.java
@@ -127064,7 +127064,7 @@
 +        this.valueList = xl!=null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java
@@ -127193,7 +127193,7 @@
 +
 +    Adapter<T,C> getAdapter();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java
@@ -127250,7 +127250,7 @@
 +     */
 +    C getClazz();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java
@@ -127307,7 +127307,7 @@
 +     */
 +    boolean canBeReferencedByIDREF();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java
@@ -127504,7 +127504,7 @@
 +     */
 +    public void dump( Result out ) throws JAXBException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeRef.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeRef.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeRef.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/TypeRef.java
@@ -127563,7 +127563,7 @@
 +     */
 +    String getDefaultValue();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java
@@ -127603,7 +127603,7 @@
 +public interface ValuePropertyInfo<T,C> extends PropertyInfo<T,C>, NonElementRef<T,C> {
 +    Adapter<T,C> getAdapter();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java
@@ -127651,7 +127651,7 @@
 +        this.allowTypedObject = allowTypedObject;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java
@@ -127692,7 +127692,7 @@
 + */
 +public interface WildcardTypeInfo<T,C> extends TypeInfo<T,C> {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/core/package-info.java
@@ -127765,7 +127765,7 @@
 +import javax.xml.bind.annotation.XmlSchema;
 +
 +import static javax.xml.bind.annotation.XmlNsForm.QUALIFIED;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java
@@ -127852,7 +127852,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java
@@ -127976,7 +127976,7 @@
 +        return nav().getTypeName(arrayType);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java
@@ -128083,7 +128083,7 @@
 +        return PropertyKind.ATTRIBUTE;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java
@@ -128188,7 +128188,7 @@
 +        return leaves;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java
@@ -129505,7 +129505,7 @@
 +
 +    private static final String[] DEFAULT_ORDER = new String[0];
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java
@@ -129545,7 +129545,7 @@
 +public interface DummyPropertyInfo<T, C, F, M> {
 +    void addType(PropertyInfoImpl<T, C, F, M> info);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java
@@ -129645,7 +129645,7 @@
 +        return wrapperRequired;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java
@@ -130080,7 +130080,7 @@
 +        return nav().getMethodLocation(method);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java
@@ -130285,7 +130285,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java
@@ -130352,7 +130352,7 @@
 +        return name;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java
@@ -130587,7 +130587,7 @@
 +        };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java
@@ -130668,7 +130668,7 @@
 +        return parent.nav().getFieldLocation(field);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java
@@ -130780,7 +130780,7 @@
 +            return parent.nav().getMethodLocation(setter);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java
@@ -130876,7 +130876,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java
@@ -130987,7 +130987,7 @@
 +        return parent.builder.getTypeInfo(type,this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Messages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Messages.java
@@ -131112,7 +131112,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Messages.properties
@@ -131325,7 +131325,7 @@
 +
 +XMLGREGORIANCALENDAR_TIMEZONE = \
 +    Timezone not set.
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java
@@ -131749,7 +131749,7 @@
 +        return subclassReplacements.containsKey(sc);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java
@@ -132140,7 +132140,7 @@
 +        return seed.hasAnnotation(annotationType);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java
@@ -132205,7 +132205,7 @@
 +     */
 +    T getRawType();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java
@@ -132596,7 +132596,7 @@
 +        return domHandler;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java
@@ -132734,7 +132734,7 @@
 +        return registryClass;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java
@@ -132786,7 +132786,7 @@
 +
 +    static final RuntimeNonElement theInstance = new RuntimeAnyTypeImpl();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java
@@ -132847,7 +132847,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java
@@ -132918,7 +132918,7 @@
 +        super.link();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
@@ -133885,7 +133885,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java
@@ -134283,7 +134283,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java
@@ -134423,7 +134423,7 @@
 +        return (RuntimeNonElement)super.getContentType();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java
@@ -134505,7 +134505,7 @@
 +        return (List<RuntimeTypeRefImpl>)super.getTypes();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java
@@ -134551,7 +134551,7 @@
 +        super(owner, name, lexical, next);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java
@@ -134712,7 +134712,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java
@@ -134785,7 +134785,7 @@
 +        return (List<? extends RuntimeTypeInfo>)super.ref();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java
@@ -134974,7 +134974,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java
@@ -135049,7 +135049,7 @@
 +        return !isMixed();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java
@@ -135155,7 +135155,7 @@
 +        return (Iterable<RuntimeElementInfoImpl>)super.getAllElements();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java
@@ -135217,7 +135217,7 @@
 +        return (RuntimePropertyInfo)owner;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java
@@ -135288,7 +135288,7 @@
 +        super.link();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java
@@ -135427,7 +135427,7 @@
 +        return xducer;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java
@@ -135597,7 +135597,7 @@
 +        return new QName(nsUri.intern(),local.intern());
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java
@@ -135993,7 +135993,7 @@
 +        m.marshal(this,out);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java
@@ -136086,7 +136086,7 @@
 +        return owner;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Util.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Util.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Util.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Util.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/Util.java
@@ -136185,7 +136185,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java
@@ -136238,7 +136238,7 @@
 +        return PropertyKind.VALUE;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/impl/package.html
@@ -136272,7 +136272,7 @@
 +Implementation of the com.sun.xml.internal.bind.j2s.model package.
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java
@@ -136358,7 +136358,7 @@
 +        return genericComponentType.hashCode();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/Navigator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/Navigator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/Navigator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/Navigator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/Navigator.java
@@ -136758,7 +136758,7 @@
 +     */
 +    boolean isInnerClass(C clazz);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java
@@ -136941,7 +136941,7 @@
 +        return sb.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java
@@ -137520,7 +137520,7 @@
 +        return t;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java
@@ -137587,7 +137587,7 @@
 +    protected abstract T onVariable(TypeVariable v, P param);
 +    protected abstract T onWildcard(WildcardType w, P param);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java
@@ -137657,7 +137657,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/package.html
@@ -137689,7 +137689,7 @@
 +<html><body>
 +  Abstraction around the reflection library, to support various reflection models (such as java.lang.reflect and APT).
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java
@@ -137743,7 +137743,7 @@
 +     */
 +    RuntimeNonElement getItemType();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java
@@ -137786,7 +137786,7 @@
 +    // refinement
 +    RuntimeNonElement getTarget();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java
@@ -137827,7 +137827,7 @@
 + */
 +public interface RuntimeBuiltinLeafInfo extends BuiltinLeafInfo<Type,Class>, RuntimeLeafInfo {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java
@@ -137904,7 +137904,7 @@
 +     */
 +    <BeanT> Accessor<BeanT,Locator> getLocatorField();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java
@@ -137945,7 +137945,7 @@
 + */
 +public interface RuntimeElement extends Element<Type,Class>, RuntimeTypeInfo {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java
@@ -138001,7 +138001,7 @@
 +     */
 +    RuntimeNonElement getContentType();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java
@@ -138048,7 +138048,7 @@
 +
 +    List<? extends RuntimeTypeRef> getTypes();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java
@@ -138089,7 +138089,7 @@
 + */
 +public interface RuntimeEnumLeafInfo extends EnumLeafInfo<Type,Class>, RuntimeLeafInfo {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java
@@ -138161,7 +138161,7 @@
 +     */
 +    QName[] getTypeNames();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java
@@ -138204,7 +138204,7 @@
 +    RuntimeNonElement getKeyType();
 +    RuntimeNonElement getValueType();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java
@@ -138254,7 +138254,7 @@
 +     */
 +    <V> Transducer<V> getTransducer();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java
@@ -138315,7 +138315,7 @@
 +
 +    // TransducedAccessor should be created
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java
@@ -138415,7 +138415,7 @@
 +     */
 +    Type getIndividualType();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java
@@ -138458,7 +138458,7 @@
 +public interface RuntimeReferencePropertyInfo extends ReferencePropertyInfo<Type,Class>, RuntimePropertyInfo {
 +    Set<? extends RuntimeElement> getElements();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java
@@ -138499,7 +138499,7 @@
 + */
 +public interface RuntimeTypeInfo extends TypeInfo<Type,Class> {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java
@@ -138560,7 +138560,7 @@
 +    Iterable<? extends RuntimeElementInfo> getAllElements();
 +    ReflectionNavigator getNavigator();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java
@@ -138603,7 +138603,7 @@
 +    RuntimeNonElement getTarget();
 +    RuntimePropertyInfo getSource();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java
@@ -138645,7 +138645,7 @@
 +public interface RuntimeValuePropertyInfo extends ValuePropertyInfo<Type,Class>,RuntimePropertyInfo,RuntimeNonElementRef {
 +    RuntimeNonElement getTarget();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/runtime/package-info.java
@@ -138688,7 +138688,7 @@
 +
 +import javax.xml.bind.annotation.XmlNsForm;
 +import javax.xml.bind.annotation.XmlSchema;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/package-info.java
@@ -138879,7 +138879,7 @@
 +import javax.xml.bind.JAXBContext;
 +
 +import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java
@@ -139059,7 +139059,7 @@
 +        return nilIncluded;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java
@@ -139246,7 +139246,7 @@
 +        return loader;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java
@@ -139391,7 +139391,7 @@
 +        else            return e.outer;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java
@@ -139431,7 +139431,7 @@
 +
 +    public boolean isNilIncluded();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java
@@ -139712,7 +139712,7 @@
 +                        name.equals(MarshallerImpl.XML_HEADERS);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java
@@ -139871,7 +139871,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java
@@ -139952,7 +139952,7 @@
 +        return unmarshaller.getAttachmentUnmarshaller();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java
@@ -140098,7 +140098,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java
@@ -140505,7 +140505,7 @@
 +        return isNilIncluded;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java
@@ -140613,7 +140613,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java
@@ -140775,7 +140775,7 @@
 +        text.append(ch,start,length);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Coordinator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Coordinator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Coordinator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Coordinator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Coordinator.java
@@ -140996,7 +140996,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java
@@ -141082,7 +141082,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java
@@ -141422,7 +141422,7 @@
 +        getLoader(grammar,true);    // make sure to build them, if we hadn't done so
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java
@@ -141510,7 +141510,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java
@@ -141702,7 +141702,7 @@
 +        return sb.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java
@@ -141801,7 +141801,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java
@@ -141883,7 +141883,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java
@@ -141941,7 +141941,7 @@
 +     */
 +    abstract void marshal( T o, XMLSerializer out ) throws IOException, SAXException, XMLStreamException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java
@@ -143051,7 +143051,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java
@@ -143599,7 +143599,7 @@
 +
 +    private static final Logger logger = Util.getClassLogger();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java
@@ -143766,7 +143766,7 @@
 +        return xducer;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java
@@ -143818,7 +143818,7 @@
 +    Method beforeMarshal;
 +    Method afterMarshal;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Location.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Location.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Location.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Location.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Location.java
@@ -143868,7 +143868,7 @@
 +     */
 +    String toString();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java
@@ -144493,7 +144493,7 @@
 +    protected static final String C14N = JAXBRIContext.CANONICALIZATION_SUPPORT;
 +    protected static final String OBJECT_IDENTITY_CYCLE_DETECTION = "com.sun.xml.internal.bind.objectIdentitityCycleDetection";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Messages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Messages.java
@@ -144568,7 +144568,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Messages.properties
@@ -144670,7 +144670,7 @@
 +
 +FAILED_TO_GENERATE_SCHEMA = \
 +    Failed to generate schema.
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java
@@ -144761,7 +144761,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Name.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Name.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Name.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Name.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Name.java
@@ -144864,7 +144864,7 @@
 +        return this.localName.compareTo(that.localName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java
@@ -145012,7 +145012,7 @@
 +        return r;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NameList.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NameList.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NameList.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NameList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NameList.java
@@ -145090,7 +145090,7 @@
 +        this.numberOfAttributeNames = numberAttributeNames;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java
@@ -145183,7 +145183,7 @@
 +     */
 +    int force(@NotNull String uri, @NotNull String prefix);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java
@@ -145321,7 +145321,7 @@
 +        return o.getClass().getName();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java
@@ -145413,7 +145413,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java
@@ -145507,7 +145507,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java
@@ -145583,7 +145583,7 @@
 +        return am.addSwaRefAttachment(data);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Transducer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Transducer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Transducer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Transducer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/Transducer.java
@@ -145722,7 +145722,7 @@
 +     */
 +    QName getTypeName(@NotNull ValueT instance);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java
@@ -145899,7 +145899,7 @@
 +        return loader;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java
@@ -146969,7 +146969,7 @@
 +        return (XMLSerializer)Coordinator._getInstance();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java
@@ -147196,7 +147196,7 @@
 +            writeNsDecl(nsBuf[i]);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java
@@ -147268,7 +147268,7 @@
 +            assoc.addInner( getBuilder().getCurrentElement(), ip );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java
@@ -147471,7 +147471,7 @@
 +            entities[c] = image;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java
@@ -147939,7 +147939,7 @@
 +        fiout.writeLowLevelAttributeValue(value);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java
@@ -148053,7 +148053,7 @@
 +        rhs.text(value,needsSeparatingWhitespace);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java
@@ -148120,7 +148120,7 @@
 +            assoc.addInner( getBuilder().getCurrentElement(), ip );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java
@@ -148280,7 +148280,7 @@
 +        super.endDocument(fragment);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java
@@ -148414,7 +148414,7 @@
 +        next.text(value, needsSeparatingWhitespace);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java
@@ -148972,7 +148972,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java
@@ -149052,7 +149052,7 @@
 +
 +    public abstract String toString();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java
@@ -149230,7 +149230,7 @@
 +        out.characters(buf,0,vlen+(needsSP?1:0));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java
@@ -149294,7 +149294,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java
@@ -149719,7 +149719,7 @@
 +    // no need to copy
 +    private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java
@@ -149850,7 +149850,7 @@
 +        text(value.toString(),needsSeparatingWhitespace);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java
@@ -150069,7 +150069,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java
@@ -150249,7 +150249,7 @@
 +     */
 +    public void text( Pcdata value, boolean needsSeparatingWhitespace ) throws IOException, SAXException, XMLStreamException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java
@@ -150392,7 +150392,7 @@
 +
 +    protected XMLSerializer serializer;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/output/package-info.java
@@ -150426,7 +150426,7 @@
 + * Code that writes well-formed XML ({@link XmlOutput} and its implementations}.
 + */
 +package com.sun.xml.internal.bind.v2.runtime.output;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/package.html
@@ -150460,7 +150460,7 @@
 +Code that implements JAXBContext, Unmarshaller, and Marshaller.
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java
@@ -150662,7 +150662,7 @@
 +            state.getContext().getScope(offset).add(acc,lister,o);
 +        }
 +    }}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java
@@ -150740,7 +150740,7 @@
 +        xducer.writeText(w,item,fieldName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java
@@ -150802,7 +150802,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java
@@ -151051,7 +151051,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java
@@ -151122,7 +151122,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java
@@ -151294,7 +151294,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java
@@ -151426,7 +151426,7 @@
 +        return this.attName.compareTo(that.attName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java
@@ -151533,7 +151533,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Messages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Messages.java
@@ -151586,7 +151586,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties
@@ -151621,7 +151621,7 @@
 +
 +UNEXPECTED_JAVA_TYPE = \
 +    Java class {0} is not allowed in this property. Expected types are: {1}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Property.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Property.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Property.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Property.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/Property.java
@@ -151766,7 +151766,7 @@
 +     */
 +    public RuntimePropertyInfo getInfo();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java
@@ -151926,7 +151926,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java
@@ -152010,7 +152010,7 @@
 +        // noop
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java
@@ -152132,7 +152132,7 @@
 +            return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java
@@ -152317,7 +152317,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java
@@ -152596,7 +152596,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java
@@ -152761,7 +152761,7 @@
 +            return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java
@@ -152845,7 +152845,7 @@
 +     */
 +    public static final QName CATCH_ALL = new QName("\u0000","catchAll");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java
@@ -152895,7 +152895,7 @@
 +        this.beanInfo = beanInfo;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java
@@ -152969,7 +152969,7 @@
 +        return offset;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java
@@ -153074,7 +153074,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java
@@ -153535,7 +153535,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java
@@ -153643,7 +153643,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java
@@ -153753,7 +153753,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java
@@ -153818,7 +153818,7 @@
 +        w.text(print(o),fieldName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java
@@ -153876,7 +153876,7 @@
 +     */
 +    E next() throws SAXException, JAXBException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java
@@ -154027,7 +154027,7 @@
 +        return acc.get(bean)!=null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java
@@ -154521,7 +154521,7 @@
 +        Stack.class
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java
@@ -154577,7 +154577,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties
@@ -154622,7 +154622,7 @@
 +NO_GETTER = \
 +    The property has a setter "{0}" but no getter. \
 +    For marshaller, please define getters.
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java
@@ -154690,7 +154690,7 @@
 +        core.set(bean,value);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java
@@ -154796,7 +154796,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java
@@ -154902,7 +154902,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java
@@ -155008,7 +155008,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java
@@ -155114,7 +155114,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java
@@ -155220,7 +155220,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java
@@ -155326,7 +155326,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java
@@ -155432,7 +155432,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java
@@ -155538,7 +155538,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java
@@ -155886,7 +155886,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java
@@ -156003,7 +156003,7 @@
 +
 +    private static final ClassLoader CLASS_LOADER = AccessorInjector.class.getClassLoader();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java
@@ -156087,7 +156087,7 @@
 +    public Ref get_ref() { throw new UnsupportedOperationException(); }
 +    public void set_ref(Ref r) { throw new UnsupportedOperationException(); }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java
@@ -156132,7 +156132,7 @@
 +    static long default_value_long = 0;
 +    static short default_value_short = 0;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java
@@ -156187,7 +156187,7 @@
 +        ((Bean)bean).f_boolean = value==null ? Const.default_value_boolean : (Boolean)value;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java
@@ -156242,7 +156242,7 @@
 +        ((Bean)bean).f_byte = value==null ? Const.default_value_byte : (Byte)value;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java
@@ -156297,7 +156297,7 @@
 +        ((Bean)bean).f_char = value==null ? Const.default_value_char : (Character)value;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java
@@ -156352,7 +156352,7 @@
 +        ((Bean)bean).f_double = value==null ? Const.default_value_double : (Double)value;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java
@@ -156407,7 +156407,7 @@
 +        ((Bean)bean).f_float = value==null ? Const.default_value_float : (Float)value;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java
@@ -156462,7 +156462,7 @@
 +        ((Bean)bean).f_int = value==null ? Const.default_value_int : (Integer)value;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java
@@ -156517,7 +156517,7 @@
 +        ((Bean)bean).f_long = value==null ? Const.default_value_long : (Long)value;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java
@@ -156569,7 +156569,7 @@
 +        ((Bean)bean).f_ref = (Ref)value;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java
@@ -156624,7 +156624,7 @@
 +        ((Bean)bean).f_short = value==null ? Const.default_value_short : (Short)value;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java
@@ -156822,7 +156822,7 @@
 +        return classes.get(className);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java
@@ -156877,7 +156877,7 @@
 +        ((Bean)bean).set_boolean( value==null ? Const.default_value_boolean : (Boolean)value );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java
@@ -156932,7 +156932,7 @@
 +        ((Bean)bean).set_byte( value==null ? Const.default_value_byte : (Byte)value );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java
@@ -156987,7 +156987,7 @@
 +        ((Bean)bean).set_char( value==null ? Const.default_value_char : (Character)value );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java
@@ -157042,7 +157042,7 @@
 +        ((Bean)bean).set_double( value==null ? Const.default_value_double : (Double)value );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java
@@ -157097,7 +157097,7 @@
 +        ((Bean)bean).set_float( value==null ? Const.default_value_float : (Float)value );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java
@@ -157152,7 +157152,7 @@
 +        ((Bean)bean).set_int( value==null ? Const.default_value_int : (Integer)value );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java
@@ -157207,7 +157207,7 @@
 +        ((Bean)bean).set_long( value==null ? Const.default_value_long : (Long)value );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java
@@ -157259,7 +157259,7 @@
 +        ((Bean)bean).set_ref((Ref)value);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java
@@ -157314,7 +157314,7 @@
 +        ((Bean)bean).set_short( value==null ? Const.default_value_short : (Short)value );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java
@@ -157506,7 +157506,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java
@@ -157678,7 +157678,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java
@@ -157720,7 +157720,7 @@
 + */
 +final class Ref {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java
@@ -157779,7 +157779,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java
@@ -157838,7 +157838,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java
@@ -157897,7 +157897,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java
@@ -157956,7 +157956,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java
@@ -158029,7 +158029,7 @@
 +        w.leafElement(tagName, ((Bean)o).f_int, fieldName );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java
@@ -158088,7 +158088,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java
@@ -158147,7 +158147,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java
@@ -158210,7 +158210,7 @@
 +//        w.leafElement(tagName, ((Bean)o).get_boolean(), fieldName );
 +//    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java
@@ -158273,7 +158273,7 @@
 +//        w.leafElement(tagName, ((Bean)o).get_byte(), fieldName );
 +//    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java
@@ -158336,7 +158336,7 @@
 +//        w.leafElement(tagName, ((Bean)o).get_double(), fieldName );
 +//    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java
@@ -158399,7 +158399,7 @@
 +//        w.leafElement(tagName, ((Bean)o).get_float(), fieldName );
 +//    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java
@@ -158472,7 +158472,7 @@
 +        w.leafElement(tagName, ((Bean)o).get_int(), fieldName );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java
@@ -158535,7 +158535,7 @@
 +//        w.leafElement(tagName, ((Bean)o).get_long(), fieldName );
 +//    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java
@@ -158598,7 +158598,7 @@
 +//        w.leafElement(tagName, ((Bean)o).get_short(), fieldName );
 +//    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html
@@ -158639,7 +158639,7 @@
 +  A template class file is slightly modified to match the target Java Bean,
 +  then it will be loaded into the VM.
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/reflect/package.html
@@ -158671,7 +158671,7 @@
 +<html><body>
 +  Abstraction around accessing data of actual objects.
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java
@@ -158725,7 +158725,7 @@
 +     */
 +    CharSequence getData(String nsUri,String localName);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java
@@ -158775,7 +158775,7 @@
 +        return getValue(nsUri,localName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java
@@ -159070,7 +159070,7 @@
 +        output.text(data,dataLen);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java
@@ -159119,7 +159119,7 @@
 +        this.receiver = receiver;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java
@@ -159191,7 +159191,7 @@
 +        };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java
@@ -159249,7 +159249,7 @@
 +        l.startElement(state,ea);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java
@@ -159305,7 +159305,7 @@
 +        state.loader = this;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java
@@ -159471,7 +159471,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java
@@ -159770,7 +159770,7 @@
 +        textReported = false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java
@@ -159897,7 +159897,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java
@@ -159992,7 +159992,7 @@
 +        output.text(data);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java
@@ -160045,7 +160045,7 @@
 +     */
 +    Object intercept(UnmarshallingContext.State state, Object o) throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java
@@ -160204,7 +160204,7 @@
 +        else            return s.intern();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java
@@ -160266,7 +160266,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java
@@ -160522,7 +160522,7 @@
 +        state.getContext().handleError(e);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java
@@ -160632,7 +160632,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java
@@ -160701,7 +160701,7 @@
 +        return locator.getColumnNumber();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java
@@ -160837,7 +160837,7 @@
 +        return next.getPredictor();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java
@@ -160896,7 +160896,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties
@@ -160951,7 +160951,7 @@
 +
 +UNINTERNED_STRINGS = \
 +    Namespace URIs and local names to the unmarshaller needs to be interned.
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java
@@ -160991,7 +160991,7 @@
 +public interface Patcher {
 +    void run() throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java
@@ -161056,7 +161056,7 @@
 +        throw new IllegalStateException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java
@@ -161106,7 +161106,7 @@
 +     */
 +    void receive(UnmarshallingContext.State state, Object o) throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java
@@ -161283,7 +161283,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java
@@ -161424,7 +161424,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java
@@ -161538,7 +161538,7 @@
 +            return prefix + ':' + localName;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java
@@ -161830,7 +161830,7 @@
 +        return attrs;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java
@@ -161907,7 +161907,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
@@ -162300,7 +162300,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java
@@ -162569,7 +162569,7 @@
 +        return beanInfo;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java
@@ -162708,7 +162708,7 @@
 +        return new QName(uri,local,getPrefix());
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java
@@ -162774,7 +162774,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java
@@ -163319,7 +163319,7 @@
 +        return coordinator;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java
@@ -164536,7 +164536,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java
@@ -164667,7 +164667,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java
@@ -164729,7 +164729,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java
@@ -164805,7 +164805,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java
@@ -164963,7 +164963,7 @@
 +        boolean expectText();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java
@@ -165080,7 +165080,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java
@@ -165196,7 +165196,7 @@
 +        return beanInfo;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java
@@ -165274,7 +165274,7 @@
 +        return r;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Form.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Form.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Form.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Form.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Form.java
@@ -165391,7 +165391,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java
@@ -165447,7 +165447,7 @@
 +        return parent._element(name,Particle.class);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Messages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Messages.java
@@ -165499,7 +165499,7 @@
 +        return MessageFormat.format( rb.getString(name()), args );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Messages.properties
@@ -165530,7 +165530,7 @@
 +#
 +
 +ANONYMOUS_TYPE_CYCLE=Anonymous types form an infinite cycle: {0}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java
@@ -165597,7 +165597,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Tree.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Tree.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Tree.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Tree.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Tree.java
@@ -165846,7 +165846,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Util.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Util.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Util.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Util.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/Util.java
@@ -165979,7 +165979,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java
@@ -167485,7 +167485,7 @@
 +
 +    private static final String newline = "\n";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java
@@ -167547,7 +167547,7 @@
 +    @XmlAttribute
 +    void version(String v);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java
@@ -167592,7 +167592,7 @@
 +    @XmlAttribute
 +    void ref(String className);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java
@@ -167634,7 +167634,7 @@
 +    @XmlAttribute
 +    void map(boolean value);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java
@@ -167673,7 +167673,7 @@
 +
 +import com.sun.xml.internal.txw2.annotation.XmlNamespace;
 +import com.sun.xml.internal.bind.v2.WellKnownNamespace;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/package-info.java
@@ -167712,7 +167712,7 @@
 +package com.sun.xml.internal.bind.v2.schemagen;
 +
 +import com.sun.xml.internal.bind.v2.model.core.TypeInfoSet;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java
@@ -167759,7 +167759,7 @@
 +    public Annotated id(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java
@@ -167810,7 +167810,7 @@
 +    public Annotation id(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java
@@ -167851,7 +167851,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java
@@ -167896,7 +167896,7 @@
 +    public Appinfo source(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java
@@ -167942,7 +167942,7 @@
 +    public Wildcard anyAttribute();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java
@@ -167986,7 +167986,7 @@
 +    public AttributeType type(QName value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java
@@ -168037,7 +168037,7 @@
 +    public ComplexContent mixed(boolean value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java
@@ -168078,7 +168078,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java
@@ -168124,7 +168124,7 @@
 +    public ComplexRestriction base(QName value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java
@@ -168184,7 +168184,7 @@
 +    public ComplexType name(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java
@@ -168227,7 +168227,7 @@
 +    public ComplexType complexType();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java
@@ -168277,7 +168277,7 @@
 +    public ComplexTypeModel mixed(boolean value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java
@@ -168335,7 +168335,7 @@
 +    @XmlElement
 +    ExplicitGroup choice();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java
@@ -168383,7 +168383,7 @@
 +    public Documentation lang(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java
@@ -168436,7 +168436,7 @@
 +    public Element nillable(boolean value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java
@@ -168475,7 +168475,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java
@@ -168519,7 +168519,7 @@
 +    public ExtensionType base(QName value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java
@@ -168565,7 +168565,7 @@
 +    public FixedOrDefault fixed(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java
@@ -168613,7 +168613,7 @@
 +    public Import schemaLocation(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java
@@ -168659,7 +168659,7 @@
 +    public List itemType(QName value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java
@@ -168714,7 +168714,7 @@
 +    public LocalAttribute use(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java
@@ -168766,7 +168766,7 @@
 +    public LocalElement ref(QName value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java
@@ -168818,7 +168818,7 @@
 +    public ExplicitGroup choice();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java
@@ -168861,7 +168861,7 @@
 +    public NoFixedFacet value(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java
@@ -168910,7 +168910,7 @@
 +    public Occurs maxOccurs(int value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java
@@ -168947,7 +168947,7 @@
 + */
 +public interface Particle extends ContentModelContainer, Occurs {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java
@@ -168986,7 +168986,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java
@@ -169064,7 +169064,7 @@
 +    public Schema version(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java
@@ -169110,7 +169110,7 @@
 +    public TopLevelElement element();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java
@@ -169157,7 +169157,7 @@
 +    public SimpleRestriction restriction();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java
@@ -169206,7 +169206,7 @@
 +    public List list();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java
@@ -169247,7 +169247,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java
@@ -169288,7 +169288,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java
@@ -169336,7 +169336,7 @@
 +    public NoFixedFacet enumeration();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java
@@ -169387,7 +169387,7 @@
 +    public SimpleType name(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java
@@ -169430,7 +169430,7 @@
 +    public SimpleType simpleType();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java
@@ -169475,7 +169475,7 @@
 +    public TopLevelAttribute name(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java
@@ -169533,7 +169533,7 @@
 +    public TopLevelElement name(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java
@@ -169582,7 +169582,7 @@
 +    public ExplicitGroup choice();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java
@@ -169621,7 +169621,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java
@@ -169667,7 +169667,7 @@
 +    public Union memberTypes(QName[] value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java
@@ -169716,7 +169716,7 @@
 +    public Wildcard namespace(String[] value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java
@@ -169747,7 +169747,7 @@
 + */
 +@com.sun.xml.internal.txw2.annotation.XmlNamespace("http://www.w3.org/2001/XMLSchema")
 +package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html
@@ -169781,7 +169781,7 @@
 +XML Schema writer generated by TXW.
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng
@@ -171364,7 +171364,7 @@
 +</define-->
 +
 +</grammar>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java
@@ -171439,7 +171439,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java
@@ -171653,7 +171653,7 @@
 +        return sb.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/DataSourceSource.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/DataSourceSource.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/DataSourceSource.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/DataSourceSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/DataSourceSource.java
@@ -171781,7 +171781,7 @@
 +        return source;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/EditDistance.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/EditDistance.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/EditDistance.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/EditDistance.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/EditDistance.java
@@ -171910,7 +171910,7 @@
 +        return cost[a.length()];
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/FatalAdapter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/FatalAdapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/FatalAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/FatalAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/FatalAdapter.java
@@ -171970,7 +171970,7 @@
 +        core.fatalError(exception);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/FlattenIterator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/FlattenIterator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/FlattenIterator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/FlattenIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/FlattenIterator.java
@@ -172056,7 +172056,7 @@
 +        //      no more object
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/QNameMap.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/QNameMap.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/QNameMap.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/QNameMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/QNameMap.java
@@ -172536,7 +172536,7 @@
 +        return buf.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/StackRecorder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/StackRecorder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/StackRecorder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/StackRecorder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/StackRecorder.java
@@ -172574,7 +172574,7 @@
 + */
 +public class StackRecorder extends Throwable {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/TypeCast.java b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/TypeCast.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/TypeCast.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/TypeCast.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/util/TypeCast.java
@@ -172627,7 +172627,7 @@
 +        return (Map<K,V>)m;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDEventListener.java b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDEventListener.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDEventListener.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDEventListener.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDEventListener.java
@@ -172976,7 +172976,7 @@
 +    public final short OCCURENCE_ZERO_OR_ONE = 2;
 +    public final short OCCURENCE_ONCE = 3;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDHandlerBase.java b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDHandlerBase.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDHandlerBase.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDHandlerBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDHandlerBase.java
@@ -173101,7 +173101,7 @@
 +    public void connector(short connectorType) throws SAXException {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/DTDParser.java
@@ -175457,7 +175457,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/EndOfInputException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/EndOfInputException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/EndOfInputException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/EndOfInputException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/EndOfInputException.java
@@ -175493,7 +175493,7 @@
 +
 +class EndOfInputException extends IOException {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/EntityDecl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/EntityDecl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/EntityDecl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/EntityDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/EntityDecl.java
@@ -175538,7 +175538,7 @@
 +    boolean isFromInternalSubset;
 +    boolean isPE;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/ExternalEntity.java b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/ExternalEntity.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/ExternalEntity.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/ExternalEntity.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/ExternalEntity.java
@@ -175597,7 +175597,7 @@
 +        return retval;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/InputEntity.java b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/InputEntity.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/InputEntity.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/InputEntity.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/InputEntity.java
@@ -176592,7 +176592,7 @@
 +        throw x;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/InternalEntity.java b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/InternalEntity.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/InternalEntity.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/InternalEntity.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/InternalEntity.java
@@ -176633,7 +176633,7 @@
 +
 +    char buf [];
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/MessageCatalog.java b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/MessageCatalog.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/MessageCatalog.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/MessageCatalog.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/MessageCatalog.java
@@ -177154,7 +177154,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/Resolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/Resolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/Resolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/Resolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/Resolver.java
@@ -177607,7 +177607,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/SimpleHashtable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/SimpleHashtable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/SimpleHashtable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/SimpleHashtable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/SimpleHashtable.java
@@ -177897,7 +177897,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlChars.java b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlChars.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlChars.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlChars.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlChars.java
@@ -178289,7 +178289,7 @@
 +                ;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlNames.java b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlNames.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlNames.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlNames.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlNames.java
@@ -178441,7 +178441,7 @@
 +        return isNmtoken(token) && token.indexOf(':') < 0;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlReader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlReader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlReader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/XmlReader.java
@@ -179230,7 +179230,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/package.html
@@ -179262,7 +179262,7 @@
 +<HTML><BODY>
 +<P>   scan DTD stream and generates appropriate events.</P>
 +</BODY></HTML>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/resources/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/resources/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/resources/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/resources/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/dtdparser/resources/Messages.properties
@@ -179504,7 +179504,7 @@
 +V-039 = IDREFS attributes must have at least one value
 +
 +V-040 = ENTITIES attributes must have at least one value
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java
@@ -179640,7 +179640,7 @@
 +       return getBundle().getKeys();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java
@@ -179734,7 +179734,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Decoder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Decoder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Decoder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Decoder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Decoder.java
@@ -181734,7 +181734,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/DecoderStateTables.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/DecoderStateTables.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/DecoderStateTables.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/DecoderStateTables.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/DecoderStateTables.java
@@ -182565,7 +182565,7 @@
 +    private DecoderStateTables() {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Encoder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Encoder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Encoder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Encoder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Encoder.java
@@ -185163,7 +185163,7 @@
 +        return start == end;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/EncodingConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/EncodingConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/EncodingConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/EncodingConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/EncodingConstants.java
@@ -185472,7 +185472,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Notation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Notation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Notation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Notation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/Notation.java
@@ -185520,7 +185520,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/OctetBufferListener.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/OctetBufferListener.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/OctetBufferListener.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/OctetBufferListener.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/OctetBufferListener.java
@@ -185567,7 +185567,7 @@
 +     */
 +    public void onBeforeOctetBufferOverwrite();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/QualifiedName.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/QualifiedName.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/QualifiedName.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/QualifiedName.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/QualifiedName.java
@@ -185884,7 +185884,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/UnparsedEntity.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/UnparsedEntity.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/UnparsedEntity.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/UnparsedEntity.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/UnparsedEntity.java
@@ -185929,7 +185929,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java
@@ -186179,7 +186179,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java
@@ -186456,7 +186456,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java
@@ -186544,7 +186544,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java
@@ -186621,7 +186621,7 @@
 +        return table[index];
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java
@@ -186672,7 +186672,7 @@
 +
 +    public double[] doubleArray = new double[INITIAL_LENGTH];
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java
@@ -186891,7 +186891,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java
@@ -187091,7 +187091,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java
@@ -187236,7 +187236,7 @@
 +        System.arraycopy((byte[])array, astart, b, start, alength);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java
@@ -187279,7 +187279,7 @@
 +    public final static int DOUBLE_MAX_CHARACTER_SIZE   = 24;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java
@@ -187478,7 +187478,7 @@
 +        return idata;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java
@@ -187523,7 +187523,7 @@
 +    public final static int LONG_MAX_CHARACTER_SIZE     = 20;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java
@@ -187740,7 +187740,7 @@
 +        return ldata;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java
@@ -187936,7 +187936,7 @@
 +        return sdata;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java
@@ -188059,7 +188059,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java
@@ -188106,7 +188106,7 @@
 +        table[RestrictedAlphabet.DATE_TIME_CHARACTERS_INDEX] = RestrictedAlphabet.DATE_TIME_CHARACTERS.toCharArray();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java
@@ -189168,7 +189168,7 @@
 +        return buffer.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java
@@ -189527,7 +189527,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java
@@ -190626,7 +190626,7 @@
 +
 +
 +} // class XMLChar
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties
@@ -190838,7 +190838,7 @@
 +message.illegalLoadFactor=Illegal load factor\: {0}
 +message.duplicateNamespaceAttribute=Duplicate namespace attribute entry
 +message.readonlyList=The list is read-only. Content can not be changed.
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java
@@ -191138,7 +191138,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/Features.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/Features.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/Features.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/Features.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/Features.java
@@ -191182,7 +191182,7 @@
 +    public static final String STRING_INTERNING_FEATURE =
 +        "http://xml.org/sax/features/string-interning";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/Properties.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/Properties.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/Properties.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/Properties.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/Properties.java
@@ -191224,7 +191224,7 @@
 +    public static final String DTD_DECLARATION_HANDLER_PROPERTY =
 +            "http://xml.org/sax/properties/declaration-handler";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java
@@ -193017,7 +193017,7 @@
 +                decodeFromBytes(_octetBuffer, _octetBufferStart, _octetBufferLength);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java
@@ -193619,7 +193619,7 @@
 +                localName, entry);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java
@@ -193892,7 +193892,7 @@
 +        _lastCheckedPrefix = prefix;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java
@@ -194072,7 +194072,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/EventLocation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/EventLocation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/EventLocation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/EventLocation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/EventLocation.java
@@ -194201,7 +194201,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java
@@ -196033,7 +196033,7 @@
 +        return "UNKNOWN_EVENT_TYPE";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java
@@ -196867,7 +196867,7 @@
 +            encodeNonZeroIntegerOnSecondBitFirstBitOne(localNameIndex);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXManager.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXManager.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXManager.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/StAXManager.java
@@ -197001,7 +197001,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java
@@ -197145,7 +197145,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java
@@ -197292,7 +197292,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java
@@ -197364,7 +197364,7 @@
 +        _text = text;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java
@@ -197481,7 +197481,7 @@
 +        return _dtd ;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java
@@ -197538,7 +197538,7 @@
 +         throw new  UnsupportedOperationException(CommonResourceBundle.getInstance().getString("message.emptyIterator"));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java
@@ -197587,7 +197587,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java
@@ -197719,7 +197719,7 @@
 +        return qn;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java
@@ -197855,7 +197855,7 @@
 +        setEventType(ENTITY_DECLARATION);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java
@@ -197944,7 +197944,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java
@@ -198171,7 +198171,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java
@@ -198278,7 +198278,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java
@@ -198364,7 +198364,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java
@@ -198430,7 +198430,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java
@@ -198661,7 +198661,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java
@@ -198846,7 +198846,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java
@@ -199092,7 +199092,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java
@@ -199240,7 +199240,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java
@@ -199421,7 +199421,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java
@@ -199687,7 +199687,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/Util.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/Util.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/Util.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/Util.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/Util.java
@@ -199768,7 +199768,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java
@@ -199810,7 +199810,7 @@
 +   public static final String ENCODING = "UTF-8";
 +   public static final String XMLVERSION = "1.0";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java
@@ -200159,7 +200159,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java
@@ -200422,7 +200422,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java
@@ -200566,7 +200566,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java
@@ -200639,7 +200639,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java
@@ -200881,7 +200881,7 @@
 +        return _reader.getProperty(name);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java
@@ -200973,7 +200973,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java
@@ -201080,7 +201080,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java
@@ -201171,7 +201171,7 @@
 +        p.parse(args);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java
@@ -201229,7 +201229,7 @@
 +        p.parse(args);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java
@@ -201312,7 +201312,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/PrintTable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/PrintTable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/PrintTable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/PrintTable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/PrintTable.java
@@ -201447,7 +201447,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java
@@ -201652,7 +201652,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java
@@ -202066,7 +202066,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java
@@ -202244,7 +202244,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java
@@ -202401,7 +202401,7 @@
 +        return new URI(resultStr.toString());
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java
@@ -202695,7 +202695,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java
@@ -202764,7 +202764,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java
@@ -202840,7 +202840,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java
@@ -202938,7 +202938,7 @@
 +        s.parse(args);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java
@@ -203019,7 +203019,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArray.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArray.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArray.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArray.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArray.java
@@ -203183,7 +203183,7 @@
 +        return new CharArray(ch, this.start + start, end - start, false);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java
@@ -203301,7 +203301,7 @@
 +        _array = newArray;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java
@@ -203535,7 +203535,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayString.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayString.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayString.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayString.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/CharArrayString.java
@@ -203619,7 +203619,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java
@@ -203850,7 +203850,7 @@
 +        _array = array;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java
@@ -203978,7 +203978,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java
@@ -204100,7 +204100,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java
@@ -204243,7 +204243,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java
@@ -204479,7 +204479,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java
@@ -204715,7 +204715,7 @@
 +        currentContext = namespacePosition = 2;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/PrefixArray.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/PrefixArray.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/PrefixArray.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/PrefixArray.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/PrefixArray.java
@@ -205228,7 +205228,7 @@
 +        };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java
@@ -205352,7 +205352,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/StringArray.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/StringArray.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/StringArray.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/StringArray.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/StringArray.java
@@ -205480,7 +205480,7 @@
 +        _array = newArray;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/StringIntMap.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/StringIntMap.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/StringIntMap.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/StringIntMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/StringIntMap.java
@@ -205703,7 +205703,7 @@
 +        return x == y || x.equals(y);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ValueArray.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ValueArray.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ValueArray.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ValueArray.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ValueArray.java
@@ -205765,7 +205765,7 @@
 +
 +    public abstract void clear();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java
@@ -205809,7 +205809,7 @@
 +        super(message);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java
@@ -206110,7 +206110,7 @@
 +        a.add(name);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java
@@ -206321,7 +206321,7 @@
 +        entry.addQualifiedName(name);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java b/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java
@@ -206397,7 +206397,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java
@@ -206599,7 +206599,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java
@@ -207275,7 +207275,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java
@@ -207323,7 +207323,7 @@
 +        return new HttpSOAPConnection();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties
@@ -207383,7 +207383,7 @@
 +# Trace messages
 +SAAJ0090.p2p.endpoint.available.only.for.JAXM=SAAJ0090: URLEndpoint is available only when JAXM is there
 +SAAJ0091.p2p.https.auth.in.POST.true=SAAJ0091: HTTPS Authorization in POST set to true
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java
@@ -207443,7 +207443,7 @@
 +     */
 +    String getValue();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java
@@ -207594,7 +207594,7 @@
 +        return super.getMessage();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java
@@ -207674,7 +207674,7 @@
 +    public MimeBodyPart getBodyPart(int index) throws MessagingException;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java
@@ -208438,7 +208438,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java
@@ -208622,7 +208622,7 @@
 +        return sb.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java
@@ -208903,7 +208903,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java
@@ -209289,7 +209289,7 @@
 +        return sb.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java
@@ -209695,7 +209695,7 @@
 +        return line.substring(j);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java
@@ -210792,7 +210792,7 @@
 +            setHeader("Content-Transfer-Encoding", encoding);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java
@@ -211431,7 +211431,7 @@
 +        this.parent = parent;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java
@@ -211552,7 +211552,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java
@@ -213064,7 +213064,7 @@
 +        return MimeUtility.MOSTLY_NONASCII;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java
@@ -213303,7 +213303,7 @@
 +        return new ParameterList((HashMap)list.clone());
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java
@@ -213366,7 +213366,7 @@
 +        super(s);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java
@@ -213448,7 +213448,7 @@
 +     */
 +    public void writeTo(long start,long end, OutputStream out);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java
@@ -213523,7 +213523,7 @@
 +        return s.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java
@@ -213675,7 +213675,7 @@
 +        return bos.toByteArray();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java
@@ -213935,7 +213935,7 @@
 +    }
 +    *** end TEST program ***/
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java
@@ -214183,7 +214183,7 @@
 +    }
 +    *** end TEST program **/
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java
@@ -214249,7 +214249,7 @@
 +        return ((b.length + 2)/3) * 4;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java
@@ -214365,7 +214365,7 @@
 +        return String.copyValueOf(buf, 0, offset);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java
@@ -214438,7 +214438,7 @@
 +        out.write(newline);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java
@@ -214526,7 +214526,7 @@
 +            return c;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java
@@ -214641,7 +214641,7 @@
 +    }
 +    *** end TEST program ***/
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java
@@ -214843,7 +214843,7 @@
 +    }
 +    *** end TEST program ****/
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java
@@ -215046,7 +215046,7 @@
 +    }
 +    *** end TEST program ***/
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java
@@ -215307,7 +215307,7 @@
 +    }
 +    **** end TEST program ****/
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java
@@ -215517,7 +215517,7 @@
 +    }
 +    **** end TEST program *****/
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
@@ -216040,7 +216040,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/Envelope.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/Envelope.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/Envelope.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/Envelope.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/Envelope.java
@@ -216101,7 +216101,7 @@
 +     */
 +    void output(OutputStream out, boolean isFastInfoset) throws IOException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java
@@ -216225,7 +216225,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java
@@ -216352,7 +216352,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java
@@ -216471,7 +216471,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java
@@ -216647,7 +216647,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java
@@ -216815,7 +216815,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties
@@ -216927,7 +216927,7 @@
 +
 +# Info messages
 +SAAJ0580.soap.set.Content-Type=SAAJ0580: Content-Type set to {0}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java
@@ -217047,7 +217047,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java
@@ -218390,7 +218390,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java
@@ -218496,7 +218496,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java
@@ -218582,7 +218582,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java
@@ -218624,7 +218624,7 @@
 +    SOAPPartImpl getSOAPPart();
 +    SOAPDocumentImpl getDocument();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java
@@ -218676,7 +218676,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java
@@ -218863,7 +218863,7 @@
 +        super.cloneNode(newdoc, deep);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java
@@ -219048,7 +219048,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java
@@ -219151,7 +219151,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java
@@ -219955,7 +219955,7 @@
 +        return sourceCharsetEncoding;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java
@@ -220032,7 +220032,7 @@
 +        super(cause);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java
@@ -220205,7 +220205,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java
@@ -220338,7 +220338,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java
@@ -220393,7 +220393,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java
@@ -220445,7 +220445,7 @@
 +                "createMessage() not supported for Dynamic Protocol");
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java
@@ -220510,7 +220510,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java
@@ -220841,7 +220841,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java
@@ -220937,7 +220937,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java
@@ -221057,7 +221057,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java
@@ -221106,7 +221106,7 @@
 +        super(ownerDoc, qname);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java
@@ -221259,7 +221259,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java
@@ -221432,7 +221432,7 @@
 +        throw new TreeException(msg);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java
@@ -222706,7 +222706,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java
@@ -223075,7 +223075,7 @@
 +                                + newName.getLocalPart());
 +     }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java
@@ -223143,7 +223143,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java
@@ -223499,7 +223499,7 @@
 +        return xmlLang;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java
@@ -223640,7 +223640,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java
@@ -223951,7 +223951,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties
@@ -224041,7 +224041,7 @@
 +# Info messages
 +SAAJ0190.impl.set.xml.declaration=SAAJ0190: Omit XML declaration set to {0}
 +SAAJ0191.impl.set.encoding=SAAJ0191: Encoding is set to {0}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java
@@ -224136,7 +224136,7 @@
 +        return txt.startsWith("<!--") && txt.endsWith("-->");
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java
@@ -224174,7 +224174,7 @@
 +        super(reason);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties
@@ -224209,7 +224209,7 @@
 +# Error messages
 +SAAJ0201.name.not.created.from.null.tag=SAAJ0201: Cannot create a name from a null tag
 +SAAJ0202.name.invalid.arg.format=SAAJ0202: Argument "{0}" must be of the form: prefix:localName
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java
@@ -224772,7 +224772,7 @@
 +}
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java
@@ -224862,7 +224862,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java
@@ -224922,7 +224922,7 @@
 +        return replaceElementWithSOAPElement(this,copy);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java
@@ -224988,7 +224988,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java
@@ -225048,7 +225048,7 @@
 +        return replaceElementWithSOAPElement(this,copy);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java
@@ -225118,7 +225118,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java
@@ -225499,7 +225499,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java
@@ -225587,7 +225587,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java
@@ -225691,7 +225691,7 @@
 +            name);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java
@@ -225819,7 +225819,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties
@@ -225859,7 +225859,7 @@
 +SAAJ0304.ver1_1.msg.invalid.SOAP1.1=SAAJ0304: InputStream does not represent a valid SOAP 1.1 Message
 +SAAJ0305.ver1_2.detail.exists.error=SAAJ0305: Cannot add Detail, Detail already exists
 +SAAJ0306.ver1_1.faultcode.incorrect.namespace=SAAJ0306: Namespace Warning, Standard Faultcode {0}, should ideally be in SOAP 1.1 Namespace
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java
@@ -225991,7 +225991,7 @@
 +   }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java
@@ -226068,7 +226068,7 @@
 +        return fault;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java
@@ -226138,7 +226138,7 @@
 +        return msg;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java
@@ -226238,7 +226238,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java
@@ -226442,7 +226442,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java
@@ -226505,7 +226505,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java
@@ -226607,7 +226607,7 @@
 +        return super.addAttribute(name, value);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java
@@ -226670,7 +226670,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java
@@ -226824,7 +226824,7 @@
 +        throw new SOAPExceptionImpl("Adding text to SOAP 1.2 Envelope is not legal");
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java
@@ -227389,7 +227389,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java
@@ -227495,7 +227495,7 @@
 +        return super.addAttribute(name, value);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java
@@ -227661,7 +227661,7 @@
 +        return super.addAttribute(name, value);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java
@@ -227772,7 +227772,7 @@
 +        return getRole();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties
@@ -227832,7 +227832,7 @@
 +SAAJ0435.ver1_2.code.not.standard=SAAJ0435: {0} is not a standard Code value
 +SAAJ0436.ver1_2.detail.exists.error=SAAJ0436: Cannot add Detail, Detail already exists
 +SAAJ0437.ver1_2.version.mismatch.error=SAAJ0437: Incorrect SOAP version for Detail element, expected SOAP 1.2
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java
@@ -227925,7 +227925,7 @@
 +   }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java
@@ -228003,7 +228003,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java
@@ -228073,7 +228073,7 @@
 +        return msg;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java
@@ -228168,7 +228168,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/Base64.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/Base64.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/Base64.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/Base64.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/Base64.java
@@ -228446,7 +228446,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java
@@ -228515,7 +228515,7 @@
 +        this.count = buf.length;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java
@@ -228701,7 +228701,7 @@
 +        return count;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/CharReader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/CharReader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/CharReader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/CharReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/CharReader.java
@@ -228755,7 +228755,7 @@
 +        return count;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/CharWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/CharWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/CharWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/CharWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/CharWriter.java
@@ -228809,7 +228809,7 @@
 +        return count;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java
@@ -229058,7 +229058,7 @@
 +        return (OutputStream) fiFastInfosetResult_getOutputStream.invoke(result, null);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java
@@ -229110,7 +229110,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java
@@ -229192,7 +229192,7 @@
 +                reader.reset();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java
@@ -230573,7 +230573,7 @@
 +    return true;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties
@@ -230611,7 +230611,7 @@
 +SAAJ0603.util.setProperty.exception=SAAJ0603: Can't create RejectDoctypSaxFilter because XMLReader.setProperty threw an exception. See stack trace for detalis
 +
 +# Info messages
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java
@@ -230687,7 +230687,7 @@
 +                  SOAP_DOMAIN + ".ver1_2";
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java
@@ -230744,7 +230744,7 @@
 +        return newHeaders;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java
@@ -230873,7 +230873,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java
@@ -230972,7 +230972,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ParserPool.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ParserPool.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ParserPool.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ParserPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/ParserPool.java
@@ -231045,7 +231045,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java
@@ -231232,7 +231232,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java
@@ -231328,7 +231328,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java
@@ -231514,7 +231514,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java
@@ -231937,7 +231937,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java
@@ -231990,7 +231990,7 @@
 +    public void convertToCharacters(Object data, StringBuffer s) throws EncodingAlgorithmException;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java
@@ -232039,7 +232039,7 @@
 +        super(e);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java
@@ -232096,7 +232096,7 @@
 +    public static final int UUID        = 8;
 +    public static final int CDATA       = 9;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java
@@ -232159,7 +232159,7 @@
 +        this.vocabulary = vocabulary;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java
@@ -232209,7 +232209,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java
@@ -232402,7 +232402,7 @@
 +    public boolean getForceStreamClose();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java
@@ -232493,7 +232493,7 @@
 +        _outputStream = outputStream;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java
@@ -232858,7 +232858,7 @@
 +     */
 +    public void setOutputStream(OutputStream s);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java
@@ -232950,7 +232950,7 @@
 +        setInputSource(new InputSource(inputStream));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java
@@ -232996,7 +232996,7 @@
 +    public static final int DATE_TIME_CHARACTERS_INDEX = 1;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java
@@ -233111,7 +233111,7 @@
 +     */
 +    public final Set attributes = new LinkedHashSet();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java
@@ -233163,7 +233163,7 @@
 +     */
 +    public void clear();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java
@@ -233283,7 +233283,7 @@
 +     */
 +    public boolean getToIndex(int index);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java
@@ -233395,7 +233395,7 @@
 +     */
 +    public void object(String URI, int algorithm, Object o)  throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java
@@ -233447,7 +233447,7 @@
 +     */
 +    public void characters(char[] ch, int start, int length, boolean index) throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java
@@ -233707,7 +233707,7 @@
 +     */
 +    public PrimitiveTypeContentHandler getPrimitiveTypeContentHandler();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java
@@ -233749,7 +233749,7 @@
 +        RestrictedAlphabetContentHandler, ExtendedContentHandler,
 +        FastInfosetSerializer {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java
@@ -233978,7 +233978,7 @@
 +     */
 +    public void uuids(long[] msblsb, int start, int length) throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java
@@ -234022,7 +234022,7 @@
 +
 +    public void alphabetCharacters(String alphabet, char ch[], int start, int length) throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java
@@ -234630,7 +234630,7 @@
 +        return sb;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java
@@ -234747,7 +234747,7 @@
 +    public void uuids(long[] msblsb, int start, int length) throws SAXException {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java
@@ -234814,7 +234814,7 @@
 +
 +    public int accessTextLength();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java
@@ -235026,7 +235026,7 @@
 +    public void writeLowLevelOctets(byte[] octets, int length)
 +    throws IOException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java
@@ -235081,7 +235081,7 @@
 +        return next = new Chunk(data.createNext(dataHead, buf));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java
@@ -235180,7 +235180,7 @@
 +        current = null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Data.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Data.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Data.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Data.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Data.java
@@ -235255,7 +235255,7 @@
 +     */
 +    Data createNext(DataHead dataHead, ByteBuffer buf);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java
@@ -235343,7 +235343,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java
@@ -235606,7 +235606,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/FileData.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/FileData.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/FileData.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/FileData.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/FileData.java
@@ -235684,7 +235684,7 @@
 +        return new FileData(file, buf);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java
@@ -235738,7 +235738,7 @@
 +        super(ts);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Header.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Header.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Header.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Header.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/Header.java
@@ -235791,7 +235791,7 @@
 +     */
 +    String getValue();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java
@@ -236034,7 +236034,7 @@
 +        return line.substring(j);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java
@@ -236186,7 +236186,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java
@@ -236307,7 +236307,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java
@@ -236560,7 +236560,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java
@@ -237065,7 +237065,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java
@@ -237157,7 +237157,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java
@@ -237368,7 +237368,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java
@@ -237469,7 +237469,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java
@@ -237590,7 +237590,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java
@@ -237942,7 +237942,7 @@
 +        return new Base64Data(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java
@@ -238048,7 +238048,7 @@
 +        return ptr;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java
@@ -238123,7 +238123,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java
@@ -238224,7 +238224,7 @@
 +        String getNamespaceURI();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java
@@ -238372,7 +238372,7 @@
 +    public abstract void close() throws IOException;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java
@@ -238562,7 +238562,7 @@
 +     */
 +    String getElementTextTrim() throws XMLStreamException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java b/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java
@@ -238721,7 +238721,7 @@
 +     */
 +    NamespaceContextEx getNamespaceContext();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Annotations.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Annotations.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Annotations.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Annotations.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Annotations.java
@@ -238781,7 +238781,7 @@
 +
 +    void addLeadingComment(CL comments) throws BuildException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/BuildException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/BuildException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/BuildException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/BuildException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/BuildException.java
@@ -238831,7 +238831,7 @@
 +        return cause;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/CommentList.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/CommentList.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/CommentList.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/CommentList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/CommentList.java
@@ -238868,7 +238868,7 @@
 +public interface CommentList<L extends Location> {
 +  void addComment(String value, L loc) throws BuildException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java
@@ -238917,7 +238917,7 @@
 +  P makePattern(L loc, A anno) throws BuildException;
 +  P makePattern(P except, L loc, A anno) throws BuildException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Div.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Div.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Div.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Div.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Div.java
@@ -238961,7 +238961,7 @@
 +        CL extends CommentList<L>> extends GrammarSection<P,E,L,A,CL> {
 +  void endDiv(L loc, A anno) throws BuildException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java
@@ -239016,7 +239016,7 @@
 +     */
 +    E makeElementAnnotation() throws BuildException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Grammar.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Grammar.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Grammar.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Grammar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Grammar.java
@@ -239063,7 +239063,7 @@
 +    CL extends CommentList<L>> extends GrammarSection<P,E,L,A,CL>, Scope<P,E,L,A,CL> {
 +    P endGrammar(L loc, A anno) throws BuildException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java
@@ -239166,7 +239166,7 @@
 +     */
 +    Include<P,E,L,A,CL> makeInclude();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Include.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Include.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Include.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Include.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Include.java
@@ -239218,7 +239218,7 @@
 +  void endInclude(Parseable current, String uri, String ns,
 +                  L loc, A anno) throws BuildException, IllegalSchemaException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java
@@ -239279,7 +239279,7 @@
 +     */
 +    P endIncludedGrammar(L loc, A anno) throws BuildException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java
@@ -239353,7 +239353,7 @@
 +
 +    N makeErrorNameClass();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java
@@ -239539,7 +239539,7 @@
 +     */
 +    P expandPattern( P p ) throws BuildException, IllegalSchemaException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Scope.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Scope.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Scope.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Scope.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/builder/Scope.java
@@ -239583,7 +239583,7 @@
 +    P makeParentRef(String name, L loc, A anno) throws BuildException;
 +    P makeRef(String name, L loc, A anno) throws BuildException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/Location.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/Location.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/Location.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/Location.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/Location.java
@@ -239615,7 +239615,7 @@
 +package com.sun.xml.internal.rngom.ast.om;
 +
 +public interface Location { }
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java
@@ -239647,7 +239647,7 @@
 +package com.sun.xml.internal.rngom.ast.om;
 +
 +public interface ParsedElementAnnotation { }
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java
@@ -239679,7 +239679,7 @@
 +package com.sun.xml.internal.rngom.ast.om;
 +
 +public interface ParsedNameClass { }
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java
@@ -239711,7 +239711,7 @@
 +package com.sun.xml.internal.rngom.ast.om;
 +
 +public interface ParsedPattern { }
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java
@@ -239798,7 +239798,7 @@
 +        return r.rhs;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java
@@ -239862,7 +239862,7 @@
 +        return columnNumber;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/ast/util/package.html
@@ -239894,7 +239894,7 @@
 +Typical implementations of the ast.builder/ast.om packages.
 +
 +Those classes are solely intended to make the AST implementation easier.
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/AfterPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/AfterPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/AfterPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/AfterPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/AfterPattern.java
@@ -239948,7 +239948,7 @@
 +      visitor.visitAfter(p1,p2);
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Alphabet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Alphabet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Alphabet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Alphabet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Alphabet.java
@@ -240007,7 +240007,7 @@
 +      throw new RestrictionViolationException("interleave_element_overlap");
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/AttributePattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/AttributePattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/AttributePattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/AttributePattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/AttributePattern.java
@@ -240135,7 +240135,7 @@
 +    return loc;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/BinaryPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/BinaryPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/BinaryPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/BinaryPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/BinaryPattern.java
@@ -240240,7 +240240,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ChoicePattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ChoicePattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ChoicePattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ChoicePattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ChoicePattern.java
@@ -240315,7 +240315,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DataExceptPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DataExceptPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DataExceptPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DataExceptPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DataExceptPattern.java
@@ -240391,7 +240391,7 @@
 +    return except;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DataPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DataPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DataPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DataPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DataPattern.java
@@ -240465,7 +240465,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java
@@ -240545,7 +240545,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ElementPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ElementPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ElementPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ElementPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ElementPattern.java
@@ -240672,7 +240672,7 @@
 +    return loc;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/EmptyPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/EmptyPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/EmptyPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/EmptyPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/EmptyPattern.java
@@ -240729,7 +240729,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ErrorPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ErrorPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ErrorPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ErrorPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ErrorPattern.java
@@ -240777,7 +240777,7 @@
 +    return f.caseError(this);
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/GroupPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/GroupPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/GroupPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/GroupPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/GroupPattern.java
@@ -240851,7 +240851,7 @@
 +    return f.caseGroup(this);
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/InterleavePattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/InterleavePattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/InterleavePattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/InterleavePattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/InterleavePattern.java
@@ -240945,7 +240945,7 @@
 +    return f.caseInterleave(this);
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ListPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ListPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ListPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ListPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ListPattern.java
@@ -241041,7 +241041,7 @@
 +    return p;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Messages.properties
@@ -241173,7 +241173,7 @@
 +# Fragments
 +name_absent_namespace=\"{0}\"
 +name_with_namespace=\"{1}\" from namespace \"{0}\"
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java
@@ -241225,7 +241225,7 @@
 +    return f.caseNotAllowed(this);
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java
@@ -241318,7 +241318,7 @@
 +    return p;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Pattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Pattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Pattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Pattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/Pattern.java
@@ -241463,7 +241463,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/PatternBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/PatternBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/PatternBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/PatternBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/PatternBuilder.java
@@ -241584,7 +241584,7 @@
 +    return makeOptional(makeOneOrMore(p));
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/PatternInterner.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/PatternInterner.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/PatternInterner.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/PatternInterner.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/PatternInterner.java
@@ -241679,7 +241679,7 @@
 +        return i == 0 ? table.length - 1 : i - 1;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/RefPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/RefPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/RefPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/RefPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/RefPattern.java
@@ -241814,7 +241814,7 @@
 +    return name;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java
@@ -241880,7 +241880,7 @@
 +        return name;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java
@@ -242654,7 +242654,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java
@@ -242783,7 +242783,7 @@
 +      idTypes = true;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/StringPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/StringPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/StringPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/StringPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/StringPattern.java
@@ -242819,7 +242819,7 @@
 +    super(false, DATA_CONTENT_TYPE, hc);
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/TextPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/TextPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/TextPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/TextPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/TextPattern.java
@@ -242883,7 +242883,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ValuePattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ValuePattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ValuePattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ValuePattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/ValuePattern.java
@@ -242962,7 +242962,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/package.html
@@ -242996,7 +242996,7 @@
 +    Minimal binarized pattern object model (one example of <tt>ast.om</tt> implementation).
 +  </body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java
@@ -243098,7 +243098,7 @@
 +        // so don't go in there.
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java
@@ -243164,7 +243164,7 @@
 +    Object caseRef(RefPattern p);
 +    Object caseAfter(AfterPattern p);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java
@@ -243216,7 +243216,7 @@
 +    void visitText();
 +    void visitList(Pattern p);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java
@@ -243315,7 +243315,7 @@
 +    public void visitAfter(Pattern p1, Pattern p2) {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/Annotation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/Annotation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/Annotation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/Annotation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/Annotation.java
@@ -243378,7 +243378,7 @@
 +        return a;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/CommentListImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/CommentListImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/CommentListImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/CommentListImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/CommentListImpl.java
@@ -243422,7 +243422,7 @@
 +        // TODO
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DAnnotation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DAnnotation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DAnnotation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DAnnotation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DAnnotation.java
@@ -243599,7 +243599,7 @@
 +        return Collections.unmodifiableList(contents);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DAttributePattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DAttributePattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DAttributePattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DAttributePattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DAttributePattern.java
@@ -243643,7 +243643,7 @@
 +        return visitor.onAttribute(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DChoicePattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DChoicePattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DChoicePattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DChoicePattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DChoicePattern.java
@@ -243690,7 +243690,7 @@
 +        return visitor.onChoice(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DContainerPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DContainerPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DContainerPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DContainerPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DContainerPattern.java
@@ -243779,7 +243779,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DDataPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DDataPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DDataPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DDataPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DDataPattern.java
@@ -243919,7 +243919,7 @@
 +        return visitor.onData(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DDefine.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DDefine.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DDefine.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DDefine.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DDefine.java
@@ -243992,7 +243992,7 @@
 +        return nullable.booleanValue();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DElementPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DElementPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DElementPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DElementPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DElementPattern.java
@@ -244037,7 +244037,7 @@
 +        return visitor.onElement(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DEmptyPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DEmptyPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DEmptyPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DEmptyPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DEmptyPattern.java
@@ -244081,7 +244081,7 @@
 +        return visitor.onEmpty(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DGrammarPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DGrammarPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DGrammarPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DGrammarPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DGrammarPattern.java
@@ -244168,7 +244168,7 @@
 +        return visitor.onGrammar(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DGroupPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DGroupPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DGroupPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DGroupPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DGroupPattern.java
@@ -244215,7 +244215,7 @@
 +        return visitor.onGroup(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DInterleavePattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DInterleavePattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DInterleavePattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DInterleavePattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DInterleavePattern.java
@@ -244262,7 +244262,7 @@
 +        return visitor.onInterleave(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DListPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DListPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DListPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DListPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DListPattern.java
@@ -244306,7 +244306,7 @@
 +        return visitor.onList(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DMixedPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DMixedPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DMixedPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DMixedPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DMixedPattern.java
@@ -244350,7 +244350,7 @@
 +        return visitor.onMixed(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java
@@ -244394,7 +244394,7 @@
 +        return visitor.onNotAllowed(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOMPrinter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOMPrinter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOMPrinter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOMPrinter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOMPrinter.java
@@ -244569,7 +244569,7 @@
 +        visitChildren(entityReference);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java
@@ -244613,7 +244613,7 @@
 +        return visitor.onOneOrMore(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOptionalPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOptionalPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOptionalPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOptionalPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DOptionalPattern.java
@@ -244657,7 +244657,7 @@
 +        return visitor.onOptional(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPattern.java
@@ -244756,7 +244756,7 @@
 +        return this instanceof DAttributePattern;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPatternVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPatternVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPatternVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPatternVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPatternVisitor.java
@@ -244811,7 +244811,7 @@
 +    V onValue( DValuePattern p );
 +    V onZeroOrMore( DZeroOrMorePattern p );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPatternWalker.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPatternWalker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPatternWalker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPatternWalker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DPatternWalker.java
@@ -244930,7 +244930,7 @@
 +        return p.getChild().accept(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DRefPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DRefPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DRefPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DRefPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DRefPattern.java
@@ -244995,7 +244995,7 @@
 +        return visitor.onRef(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java
@@ -245212,7 +245212,7 @@
 +        return p;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DTextPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DTextPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DTextPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DTextPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DTextPattern.java
@@ -245256,7 +245256,7 @@
 +        return visitor.onText(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DUnaryPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DUnaryPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DUnaryPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DUnaryPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DUnaryPattern.java
@@ -245301,7 +245301,7 @@
 +        this.child = child;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DValuePattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DValuePattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DValuePattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DValuePattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DValuePattern.java
@@ -245380,7 +245380,7 @@
 +        return visitor.onValue(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DXMLPrinter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DXMLPrinter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DXMLPrinter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DXMLPrinter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DXMLPrinter.java
@@ -245948,7 +245948,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java
@@ -246002,7 +246002,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java
@@ -246044,7 +246044,7 @@
 +        return visitor.onZeroOrMore(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java
@@ -246117,7 +246117,7 @@
 +        return p;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java
@@ -246189,7 +246189,7 @@
 +    public void addLeadingComment(CommentList comments) throws BuildException {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/ElementWrapper.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/ElementWrapper.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/ElementWrapper.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/ElementWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/ElementWrapper.java
@@ -246233,7 +246233,7 @@
 +        this.element = e;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java
@@ -246354,7 +246354,7 @@
 +        return DSchemaBuilderImpl.wrap( new DRefPattern(grammar.getOrAdd(name)), (LocatorImpl)loc, (Annotation)anno );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/IncludeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/IncludeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/IncludeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/IncludeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/IncludeImpl.java
@@ -246445,7 +246445,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/Main.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/Main.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/Main.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/Main.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/Main.java
@@ -246528,7 +246528,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/PatternParseable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/PatternParseable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/PatternParseable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/PatternParseable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/PatternParseable.java
@@ -246739,7 +246739,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/digested/package.html
@@ -246773,7 +246773,7 @@
 +inclusions and some other syntax sugars, while still retaining
 +all the annotations, location information, and etc.
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java
@@ -246833,7 +246833,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java
@@ -246890,7 +246890,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java
@@ -246989,7 +246989,7 @@
 +        };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java
@@ -247046,7 +247046,7 @@
 +    return dt;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java
@@ -247111,7 +247111,7 @@
 +        return createDatatypeBuilder(type).createDatatype();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java
@@ -247173,7 +247173,7 @@
 +        return core.createDatatypeLibrary(uri);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java
@@ -247240,7 +247240,7 @@
 +        return createDatatypeBuilder(type).createDatatype();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/Messages.properties
@@ -247272,7 +247272,7 @@
 +
 +# Properties file specifying messages
 +builtin_param=builtin datatypes do not have any parameters
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/dt/builtin/package.html
@@ -247302,7 +247302,7 @@
 + questions.
 +-->
 +RELAX NG built-in datatype implementation.
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/AnyNameClass.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/AnyNameClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/AnyNameClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/AnyNameClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/AnyNameClass.java
@@ -247367,7 +247367,7 @@
 +        return NameClass.ANY;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java
@@ -247434,7 +247434,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java
@@ -247508,7 +247508,7 @@
 +        return nameClass1.isOpen() || nameClass2.isOpen();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClass.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClass.java
@@ -247623,7 +247623,7 @@
 +     */
 +    public static final NameClass NULL = new NullNameClass();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java
@@ -247719,7 +247719,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassVisitor.java
@@ -247785,7 +247785,7 @@
 +     */
 +    V visitNull();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassWalker.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassWalker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassWalker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassWalker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NameClassWalker.java
@@ -247852,7 +247852,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NsNameClass.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NsNameClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NsNameClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NsNameClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NsNameClass.java
@@ -247919,7 +247919,7 @@
 +    return true;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java
@@ -247991,7 +247991,7 @@
 +    return true;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NullNameClass.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NullNameClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NullNameClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NullNameClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/NullNameClass.java
@@ -248056,7 +248056,7 @@
 +        return NameClass.NULL;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/OverlapDetector.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/OverlapDetector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/OverlapDetector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/OverlapDetector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/OverlapDetector.java
@@ -248157,7 +248157,7 @@
 +        return new OverlapDetector(nc1, nc2).overlaps;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/SimpleNameClass.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/SimpleNameClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/SimpleNameClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/SimpleNameClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/SimpleNameClass.java
@@ -248229,7 +248229,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/nc/package.html
@@ -248263,7 +248263,7 @@
 +    Default Name Class Object Model (one example of <tt>ast.om</tt> implementation).
 +  </body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Context.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Context.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Context.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Context.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Context.java
@@ -248313,7 +248313,7 @@
 +     */
 +    Context copy();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java
@@ -248348,7 +248348,7 @@
 + * Signals a violation of the RELAX NG spec.
 + */
 +public class IllegalSchemaException extends Exception { }
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Messages.properties
@@ -248381,7 +248381,7 @@
 +# common messages between XML and compact syntax parser
 +parent_ref_outside_grammar=parentRef is used outside a grammar
 +ref_outside_grammar=ref is used outside a grammar
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Parseable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Parseable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Parseable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Parseable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/Parseable.java
@@ -248457,7 +248457,7 @@
 +    <P extends ParsedPattern> P parseExternal(String uri, SchemaBuilder<?,P,?,?,?,?> f, Scope s, String inheritedNs)
 +        throws BuildException, IllegalSchemaException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java
@@ -248579,7 +248579,7 @@
 +    return encoding;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java
@@ -251933,7 +251933,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.jj b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.jj
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.jj openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.jj
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.jj
@@ -253901,7 +253901,7 @@
 +{
 +  < ILLEGAL_CHAR : [ "\u0000" - "\u0008", "\u000b" - "\uffff" ] >
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java
@@ -254030,7 +254030,7 @@
 +  };
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java
@@ -255869,7 +255869,7 @@
 +   }
 +}
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/EOFException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/EOFException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/EOFException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/EOFException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/EOFException.java
@@ -255904,7 +255904,7 @@
 +
 +public class EOFException extends IOException {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java
@@ -255958,7 +255958,7 @@
 +    return columnNumber;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java
@@ -256534,7 +256534,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/Messages.properties
@@ -256586,7 +256586,7 @@
 +illegal_surrogate_pair=illegal surrogate pair
 +relax_ng_namespace=annotations cannot have namespace URI \"http://relaxng.org/ns/structure/1.0\"
 +top_level_follow_annotation=top-level pattern cannot have following annotations
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/ParseException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/ParseException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/ParseException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/ParseException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/ParseException.java
@@ -256807,7 +256807,7 @@
 +   }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/Token.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/Token.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/Token.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/Token.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/Token.java
@@ -256917,7 +256917,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java
@@ -257079,7 +257079,7 @@
 +      this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
 +   }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java
@@ -257657,7 +257657,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java
@@ -257733,7 +257733,7 @@
 +        rhs.addLeadingComment(comments.rhs);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/Base.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/Base.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/Base.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/Base.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/Base.java
@@ -257790,7 +257790,7 @@
 +    private static final AnnotationsHost nullAnnotations = new AnnotationsHost(null,null);
 +    private static final LocationHost nullLocation = new LocationHost(null,null);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/CommentListHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/CommentListHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/CommentListHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/CommentListHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/CommentListHost.java
@@ -257848,7 +257848,7 @@
 +            rhs.addComment(value,loc.rhs);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java
@@ -257935,7 +257935,7 @@
 +            rhs.makePattern(except.rhs, loc.rhs, anno.rhs));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/DivHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/DivHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/DivHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/DivHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/DivHost.java
@@ -257995,7 +257995,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java
@@ -258061,7 +258061,7 @@
 +            rhs.makeElementAnnotation() );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/GrammarHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/GrammarHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/GrammarHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/GrammarHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/GrammarHost.java
@@ -258130,7 +258130,7 @@
 +            rhs.endGrammar(loc.rhs, anno.rhs));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java
@@ -258220,7 +258220,7 @@
 +        rhs.topLevelComment(comments==null?null:comments.rhs);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/IncludeHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/IncludeHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/IncludeHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/IncludeHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/IncludeHost.java
@@ -258282,7 +258282,7 @@
 +        rhs.endInclude( current, uri, ns, loc.rhs, anno.rhs );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/LocationHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/LocationHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/LocationHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/LocationHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/LocationHost.java
@@ -258329,7 +258329,7 @@
 +        this.rhs = rhs;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java
@@ -258478,7 +258478,7 @@
 +        return new ParsedNameClassHost( lhs.makeErrorNameClass(), rhs.makeErrorNameClass() );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java
@@ -258525,7 +258525,7 @@
 +        this.rhs = rhs;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java
@@ -258572,7 +258572,7 @@
 +        this.rhs = rhs;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java
@@ -258619,7 +258619,7 @@
 +        this.rhs = rhs;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java
@@ -258975,7 +258975,7 @@
 +        return lhs.usesComments() || rhs.usesComments();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ScopeHost.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ScopeHost.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ScopeHost.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ScopeHost.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/ScopeHost.java
@@ -259045,7 +259045,7 @@
 +            rhs.makeRef(name, loc.rhs, anno.rhs));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/host/package.html
@@ -259076,7 +259076,7 @@
 +-->
 +implementation of the <tt>asm.builder</tt> package that uses two
 +other builds simultaneously.
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/DtdContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/DtdContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/DtdContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/DtdContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/DtdContext.java
@@ -259154,7 +259154,7 @@
 +        unparsedEntityTable.clear();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/Messages.properties
@@ -259222,7 +259222,7 @@
 +undefined_prefix=undefined prefix \"{0}\"
 +value_contains_foreign_element=\"value\" element cannot contain foreign elements
 +wrong_uri_version=namespace URI has wrong version: expected \"{0}\" but got \"{1}\"
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java
@@ -259355,7 +259355,7 @@
 +        throw new BuildException(e);
 +      }
 +    }
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java
@@ -261023,7 +261023,7 @@
 +      error("invalid_uri", s);
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Localizer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Localizer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Localizer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Localizer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Localizer.java
@@ -261122,7 +261122,7 @@
 +        return bundle;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Uri.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Uri.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Uri.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Uri.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Uri.java
@@ -261300,7 +261300,7 @@
 +    return true;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Utf16.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Utf16.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Utf16.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Utf16.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/util/Utf16.java
@@ -261352,7 +261352,7 @@
 +    return (char)(((c - 0x10000) & 0x3FF) | 0xDC00);
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java
@@ -261408,7 +261408,7 @@
 +  public void comment(char[] chars, int start, int length) throws SAXException {
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java
@@ -261481,7 +261481,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java
@@ -261530,7 +261530,7 @@
 +   */
 +  XMLReader createXMLReader() throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java
@@ -261617,7 +261617,7 @@
 +    return Uri.resolve(getBaseUri1(stack.systemId, stack.parent), baseUri);
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/EncodingMap.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/EncodingMap.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/EncodingMap.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/EncodingMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/EncodingMap.java
@@ -261682,7 +261682,7 @@
 +    System.err.println(getJavaName(args[0]));
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/Naming.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/Naming.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/Naming.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/Naming.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/Naming.java
@@ -261892,7 +261892,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java b/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java
@@ -261937,7 +261937,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractCreator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractCreator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractCreator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractCreator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractCreator.java
@@ -262130,7 +262130,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java
@@ -262275,7 +262275,7 @@
 +    protected Object[] _contentObjects;
 +    protected int _contentObjectsPtr;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractProcessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractProcessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractProcessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractProcessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AbstractProcessor.java
@@ -262538,7 +262538,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AttributesHolder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AttributesHolder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AttributesHolder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AttributesHolder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/AttributesHolder.java
@@ -262735,7 +262735,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/FragmentedArray.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/FragmentedArray.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/FragmentedArray.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/FragmentedArray.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/FragmentedArray.java
@@ -262815,7 +262815,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java
@@ -263066,7 +263066,7 @@
 +        _hasInternedStrings = hasInternedStrings;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java
@@ -263544,7 +263544,7 @@
 +        return _contentObjectsPtr;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java
@@ -263589,7 +263589,7 @@
 +        super(e);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java
@@ -263670,7 +263670,7 @@
 +        treeCount = 1; // TODO: define a way to create a mark over a forest
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java
@@ -263792,7 +263792,7 @@
 +        return (LexicalHandler) getHandler();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java
@@ -263899,7 +263899,7 @@
 +        return _bufferProcessor;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java
@@ -263951,7 +263951,7 @@
 +    public void endCDATA() throws SAXException { }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/Features.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/Features.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/Features.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/Features.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/Features.java
@@ -263997,7 +263997,7 @@
 +    public static final String STRING_INTERNING_FEATURE =
 +        "http://xml.org/sax/features/string-interning";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/Properties.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/Properties.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/Properties.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/Properties.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/Properties.java
@@ -264035,7 +264035,7 @@
 +    public static final String LEXICAL_HANDLER_PROPERTY =
 +            "http://xml.org/sax/properties/lexical-handler";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java
@@ -264309,7 +264309,7 @@
 +        throw e;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java
@@ -264985,7 +264985,7 @@
 +
 +    private static final DefaultWithLexicalHandler DEFAULT_LEXICAL_HANDLER = new DefaultWithLexicalHandler();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java
@@ -265279,7 +265279,7 @@
 +        currentContext = namespacePosition = 2;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java
@@ -265394,7 +265394,7 @@
 +        this.checkAttributeValue = value;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java
@@ -265769,7 +265769,7 @@
 +        storeProcessingInstruction(reader.getPITarget(), reader.getPIData());
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java
@@ -266860,7 +266860,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java
@@ -267136,7 +267136,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java
@@ -267655,7 +267655,7 @@
 +        } while((item & TYPE_MASK) == T_ATTRIBUTE);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Attribute.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Attribute.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Attribute.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Attribute.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Attribute.java
@@ -267715,7 +267715,7 @@
 +        return this.localName.equals(localName) && this.nsUri.equals(nsUri);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Cdata.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Cdata.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Cdata.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Cdata.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Cdata.java
@@ -267761,7 +267761,7 @@
 +        visitor.onCdata(buffer);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Comment.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Comment.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Comment.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Comment.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Comment.java
@@ -267816,7 +267816,7 @@
 +        visitor.onComment(buffer);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/ContainerElement.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/ContainerElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/ContainerElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/ContainerElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/ContainerElement.java
@@ -268197,7 +268197,7 @@
 +        return child._cast(contentModel);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Content.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Content.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Content.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Content.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Content.java
@@ -268282,7 +268282,7 @@
 +    public void written() {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/ContentVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/ContentVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/ContentVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/ContentVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/ContentVisitor.java
@@ -268334,7 +268334,7 @@
 +
 +    void onComment(StringBuilder buffer);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/DatatypeWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/DatatypeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/DatatypeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/DatatypeWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/DatatypeWriter.java
@@ -268454,7 +268454,7 @@
 +        }
 +      });
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Document.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Document.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Document.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Document.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Document.java
@@ -268797,7 +268797,7 @@
 +        return (char)iota++;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/EndDocument.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/EndDocument.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/EndDocument.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/EndDocument.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/EndDocument.java
@@ -268841,7 +268841,7 @@
 +        visitor.onEndDocument();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/EndTag.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/EndTag.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/EndTag.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/EndTag.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/EndTag.java
@@ -268885,7 +268885,7 @@
 +        visitor.onEndTag();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/IllegalAnnotationException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/IllegalAnnotationException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/IllegalAnnotationException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/IllegalAnnotationException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/IllegalAnnotationException.java
@@ -268937,7 +268937,7 @@
 +
 +    private static final long serialVersionUID = 1L;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/IllegalSignatureException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/IllegalSignatureException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/IllegalSignatureException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/IllegalSignatureException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/IllegalSignatureException.java
@@ -268989,7 +268989,7 @@
 +
 +    private static final long serialVersionUID = 1L;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceDecl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceDecl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceDecl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceDecl.java
@@ -269062,7 +269062,7 @@
 +        this.uniqueId = uniqueId;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceResolver.java
@@ -269112,7 +269112,7 @@
 +     */
 +    String getPrefix(String nsUri);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceSupport.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceSupport.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceSupport.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceSupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/NamespaceSupport.java
@@ -269959,7 +269959,7 @@
 +}
 +
 +// end of NamespaceSupport.java
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Pcdata.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Pcdata.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Pcdata.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Pcdata.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Pcdata.java
@@ -270005,7 +270005,7 @@
 +        visitor.onPcdata(buffer);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/StartDocument.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/StartDocument.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/StartDocument.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/StartDocument.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/StartDocument.java
@@ -270049,7 +270049,7 @@
 +        visitor.onStartDocument();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/StartTag.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/StartTag.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/StartTag.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/StartTag.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/StartTag.java
@@ -270302,7 +270302,7 @@
 +        return ns.dummyPrefix;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TXW.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TXW.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TXW.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TXW.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TXW.java
@@ -270424,7 +270424,7 @@
 +        return new ContainerElement(new Document(out),null,tagName.getNamespaceURI(),tagName.getLocalPart())._cast(rootElement);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Text.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Text.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Text.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Text.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/Text.java
@@ -270475,7 +270475,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TxwException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TxwException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TxwException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TxwException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TxwException.java
@@ -270525,7 +270525,7 @@
 +
 +    private static final long serialVersionUID = 1L;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TypedXmlWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TypedXmlWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TypedXmlWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TypedXmlWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/TypedXmlWriter.java
@@ -270796,7 +270796,7 @@
 +     */
 +    <T extends TypedXmlWriter> T _cast( Class<T> targetInterface );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlAttribute.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlAttribute.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlAttribute.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlAttribute.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlAttribute.java
@@ -270874,7 +270874,7 @@
 +     */
 +    String ns() default "";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlCDATA.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlCDATA.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlCDATA.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlCDATA.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlCDATA.java
@@ -270922,7 +270922,7 @@
 +@Target({METHOD})
 +public @interface XmlCDATA {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlElement.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlElement.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlElement.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlElement.java
@@ -271025,7 +271025,7 @@
 +     */
 +    String ns() default "##default";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlNamespace.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlNamespace.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlNamespace.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlNamespace.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlNamespace.java
@@ -271083,7 +271083,7 @@
 +     */
 +    String value();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlValue.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlValue.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlValue.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlValue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/XmlValue.java
@@ -271145,7 +271145,7 @@
 +@Target({METHOD})
 +public @interface XmlValue {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/annotation/package.html
@@ -271198,7 +271198,7 @@
 +
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java
@@ -271253,7 +271253,7 @@
 +    void escape( char ch[], int start, int length, boolean isAttVal, Writer out ) throws IOException;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DataWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DataWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DataWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DataWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DataWriter.java
@@ -271632,7 +271632,7 @@
 +}
 +
 +// end of DataWriter.java
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java
@@ -271807,7 +271807,7 @@
 +        return writer.getProperty(name);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DomSerializer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DomSerializer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DomSerializer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DomSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DomSerializer.java
@@ -272123,7 +272123,7 @@
 +        inCDATA = false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java
@@ -272208,7 +272208,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DumpSerializer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DumpSerializer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DumpSerializer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DumpSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/DumpSerializer.java
@@ -272304,7 +272304,7 @@
 +        out.println("flush");
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java
@@ -272620,7 +272620,7 @@
 +    private String indentStep = "";
 +    private int depth = 0;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java
@@ -272819,7 +272819,7 @@
 +        super.writeCData(data);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/ResultFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/ResultFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/ResultFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/ResultFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/ResultFactory.java
@@ -272891,7 +272891,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/SaxSerializer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/SaxSerializer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/SaxSerializer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/SaxSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/SaxSerializer.java
@@ -273109,7 +273109,7 @@
 +        return qName;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/StaxSerializer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/StaxSerializer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/StaxSerializer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/StaxSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/StaxSerializer.java
@@ -273259,7 +273259,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/StreamSerializer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/StreamSerializer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/StreamSerializer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/StreamSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/StreamSerializer.java
@@ -273458,7 +273458,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/TXWResult.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/TXWResult.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/TXWResult.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/TXWResult.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/TXWResult.java
@@ -273528,7 +273528,7 @@
 +        this.systemId = systemId;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/TXWSerializer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/TXWSerializer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/TXWSerializer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/TXWSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/TXWSerializer.java
@@ -273619,7 +273619,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/XMLWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/XMLWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/XMLWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/XMLWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/XMLWriter.java
@@ -274699,7 +274699,7 @@
 +}
 +
 +// end of XMLWriter.java
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/XmlSerializer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/XmlSerializer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/XmlSerializer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/XmlSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/XmlSerializer.java
@@ -274856,7 +274856,7 @@
 +     */
 +    void flush();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/output/package.html
@@ -274892,7 +274892,7 @@
 +
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/txw2/package.html
@@ -274928,7 +274928,7 @@
 +
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/Closeable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/Closeable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/Closeable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/Closeable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/Closeable.java
@@ -274994,7 +274994,7 @@
 +     */
 +    public void close() throws WebServiceException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java
@@ -275366,7 +275366,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/ProblemAction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/ProblemAction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/ProblemAction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/ProblemAction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/ProblemAction.java
@@ -275436,7 +275436,7 @@
 +        return soapAction;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java
@@ -275490,7 +275490,7 @@
 +        this.value = name;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java
@@ -275610,7 +275610,7 @@
 +            "    <Address>http://www.w3.org/2005/08/addressing/anonymous</Address>\n" +
 +            "</EndpointReference>";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java
@@ -275684,7 +275684,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java
@@ -275765,7 +275765,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaClientTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaClientTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaClientTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaClientTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaClientTube.java
@@ -275868,7 +275868,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java
@@ -275999,7 +275999,7 @@
 +        model = parse(WsaPropertyBag.class);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaServerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaServerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaServerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaServerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaServerTube.java
@@ -276341,7 +276341,7 @@
 +
 +    private static final Logger LOGGER = Logger.getLogger(WsaServerTube.class.getName());
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTube.java
@@ -276731,7 +276731,7 @@
 +    }
 +    private static final Logger LOGGER = Logger.getLogger(WsaTube.class.getName());
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java
@@ -277062,7 +277062,7 @@
 +    protected final SOAPVersion soapVer;
 +    protected final AddressingVersion addVer;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java
@@ -277155,7 +277155,7 @@
 +        getInvalidMapDetail(name, element);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java
@@ -277206,7 +277206,7 @@
 +        return action;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java
@@ -277275,7 +277275,7 @@
 +        return subsubcode;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java
@@ -277358,7 +277358,7 @@
 +        return packet;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java
@@ -277440,7 +277440,7 @@
 +    public static final String MEX_METADATA_DIALECT_ATTRIBUTE = "Dialect";
 +    public static final String MEX_METADATA_DIALECT_VALUE = "http://schemas.xmlsoap.org/wsdl/";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java
@@ -277529,7 +277529,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java
@@ -277621,7 +277621,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java
@@ -277690,7 +277690,7 @@
 +        return soapAction;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java
@@ -277744,7 +277744,7 @@
 +        this.value = name;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java
@@ -277838,7 +277838,7 @@
 +        getInvalidMapDetail(name, element);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/BindingID.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/BindingID.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/BindingID.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/BindingID.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/BindingID.java
@@ -278280,7 +278280,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/BindingIDFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/BindingIDFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/BindingIDFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/BindingIDFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/BindingIDFactory.java
@@ -278351,7 +278351,7 @@
 +     */
 +    public abstract @Nullable BindingID parse(@NotNull String lexical) throws WebServiceException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/DistributedPropertySet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/DistributedPropertySet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/DistributedPropertySet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/DistributedPropertySet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/DistributedPropertySet.java
@@ -278501,7 +278501,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/EndpointAddress.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/EndpointAddress.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/EndpointAddress.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/EndpointAddress.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/EndpointAddress.java
@@ -278714,7 +278714,7 @@
 +        return stringForm;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/FeatureConstructor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/FeatureConstructor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/FeatureConstructor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/FeatureConstructor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/FeatureConstructor.java
@@ -278785,7 +278785,7 @@
 +     */
 +    String[] value() default {};
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/PropertySet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/PropertySet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/PropertySet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/PropertySet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/PropertySet.java
@@ -279212,7 +279212,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/ResourceLoader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/ResourceLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/ResourceLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/ResourceLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/ResourceLoader.java
@@ -279284,7 +279284,7 @@
 +    public abstract URL getResource(String resource) throws MalformedURLException;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/SOAPVersion.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/SOAPVersion.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/SOAPVersion.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/SOAPVersion.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/SOAPVersion.java
@@ -279514,7 +279514,7 @@
 +            return SOAP_11;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSBinding.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSBinding.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSBinding.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSBinding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSBinding.java
@@ -279642,7 +279642,7 @@
 +     */
 +    @NotNull WSFeatureList getFeatures();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSFeatureList.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSFeatureList.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSFeatureList.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSFeatureList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSFeatureList.java
@@ -279707,7 +279707,7 @@
 +      */
 +    @NotNull WebServiceFeature[] toArray();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSService.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSService.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSService.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSService.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/WSService.java
@@ -279940,7 +279940,7 @@
 +        });
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java
@@ -280693,7 +280693,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/EPRHeader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/EPRHeader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/EPRHeader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/EPRHeader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/EPRHeader.java
@@ -280808,7 +280808,7 @@
 +        epr.writeTo(localName,contentHandler,errorHandler,true);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java
@@ -280978,7 +280978,7 @@
 +        this.relatesToID = id;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java
@@ -281334,7 +281334,7 @@
 +    private static final String TRUE_VALUE = "1";
 +    private static final String IS_REFERENCE_PARAMETER = "IsReferenceParameter";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java
@@ -282305,7 +282305,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/addressing/package-info.java
@@ -282338,7 +282338,7 @@
 +@javax.xml.bind.annotation.XmlSchema(namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing",
 +        location = "http://schemas.xmlsoap.org/ws/2004/08/addressing")
 +package com.sun.xml.internal.ws.api.addressing;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java
@@ -282416,7 +282416,7 @@
 +        return tail;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java
@@ -282510,7 +282510,7 @@
 +        return ID;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java
@@ -282642,7 +282642,7 @@
 +        };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java
@@ -282749,7 +282749,7 @@
 +        return threadLocalFactories.get().remove(factory);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/WSPortInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/WSPortInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/WSPortInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/WSPortInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/client/WSPortInfo.java
@@ -282818,7 +282818,7 @@
 +     */
 +    @Nullable WSDLPort getPort();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java
@@ -282901,7 +282901,7 @@
 +        return ID;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/handler/MessageHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/handler/MessageHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/handler/MessageHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/handler/MessageHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/handler/MessageHandler.java
@@ -282960,7 +282960,7 @@
 +  Set<QName> getHeaders();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java
@@ -283053,7 +283053,7 @@
 +    public @Nullable WSDLPort getPort();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Attachment.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Attachment.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Attachment.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Attachment.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Attachment.java
@@ -283144,7 +283144,7 @@
 +     */
 +    void writeTo(SOAPMessage saaj) throws SOAPException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/AttachmentSet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/AttachmentSet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/AttachmentSet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/AttachmentSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/AttachmentSet.java
@@ -283219,7 +283219,7 @@
 +    public void add(Attachment att);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java
@@ -283277,7 +283277,7 @@
 +     */
 +    public abstract Message getFaultMessage();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java
@@ -283446,7 +283446,7 @@
 +        return delegate.getID(av, sv);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Header.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Header.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Header.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Header.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Header.java
@@ -283776,7 +283776,7 @@
 +     */
 +    public @NotNull String getStringContent();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/HeaderList.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/HeaderList.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/HeaderList.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/HeaderList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/HeaderList.java
@@ -284575,7 +284575,7 @@
 +        // TODO: validate client-inbound Action
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Headers.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Headers.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Headers.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Headers.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Headers.java
@@ -284739,7 +284739,7 @@
 +        return new StringHeader(name, value);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Message.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Message.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Message.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Message.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Message.java
@@ -285442,7 +285442,7 @@
 +        return uuid;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Messages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Messages.java
@@ -285839,7 +285839,7 @@
 +        return SOAPFaultBuilder.createSOAPFaultMessage(soapVersion, pex, faultcode);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Packet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Packet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Packet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Packet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/Packet.java
@@ -286652,7 +286652,7 @@
 +        return model;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/package-info.java
@@ -286686,7 +286686,7 @@
 + * {@link Message} and related abstractions that represent a SOAP message.
 + */
 +package com.sun.xml.internal.ws.api.message;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java
@@ -286780,7 +286780,7 @@
 +        this.msg = msg;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java
@@ -286857,7 +286857,7 @@
 +        this.attachments = attachments;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java
@@ -286935,7 +286935,7 @@
 +        this.msg = msg;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/CheckedException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/CheckedException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/CheckedException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/CheckedException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/CheckedException.java
@@ -287040,7 +287040,7 @@
 +     */
 +    String getMessageName();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/ExceptionType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/ExceptionType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/ExceptionType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/ExceptionType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/ExceptionType.java
@@ -287097,7 +287097,7 @@
 +    }
 +    private final int exceptionType;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/JavaMethod.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/JavaMethod.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/JavaMethod.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/JavaMethod.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/JavaMethod.java
@@ -287242,7 +287242,7 @@
 +    @Nullable QName getResponsePayloadName();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/MEP.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/MEP.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/MEP.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/MEP.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/MEP.java
@@ -287298,7 +287298,7 @@
 +        return this==ONE_WAY;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/Parameter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/Parameter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/Parameter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/Parameter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/Parameter.java
@@ -287466,7 +287466,7 @@
 +     */
 +    String getPartName();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/ParameterBinding.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/ParameterBinding.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/ParameterBinding.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/ParameterBinding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/ParameterBinding.java
@@ -287600,7 +287600,7 @@
 +        return kind==Kind.ATTACHMENT;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/SEIModel.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/SEIModel.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/SEIModel.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/SEIModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/SEIModel.java
@@ -287776,7 +287776,7 @@
 +     */
 +    @NotNull String getTargetNamespace();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java
@@ -287882,7 +287882,7 @@
 +        return soapAction;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java
@@ -287960,7 +287960,7 @@
 +     */
 +    @NotNull WSDLBoundOperation getBoundOperation();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java
@@ -288070,7 +288070,7 @@
 +    @Nullable QName getReqPayloadName();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java
@@ -288190,7 +288190,7 @@
 +     */
 +    @Nullable WSDLBoundOperation getOperation(String namespaceUri, String localName);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java
@@ -288255,7 +288255,7 @@
 +
 +    private final int value;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java
@@ -288345,7 +288345,7 @@
 +     */
 +    void addExtension(WSDLExtension extension);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java
@@ -288398,7 +288398,7 @@
 +     */
 +    public QName getName();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java
@@ -288470,7 +288470,7 @@
 +    @NotNull
 +    QName getQName();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java
@@ -288536,7 +288536,7 @@
 +     */
 +    void addFeature(@NotNull WebServiceFeature feature);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java
@@ -288630,7 +288630,7 @@
 +    @NotNull
 +    QName getQName();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java
@@ -288680,7 +288680,7 @@
 +     */
 +    Iterable<? extends WSDLPart> parts();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java
@@ -288827,7 +288827,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java
@@ -288875,7 +288875,7 @@
 +    @NotNull
 +    Locator getLocation();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java
@@ -288995,7 +288995,7 @@
 +     */
 +    @NotNull QName getPortTypeName();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java
@@ -289082,7 +289082,7 @@
 +    @NotNull
 +    QName getQName();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java
@@ -289143,7 +289143,7 @@
 +     */
 +    public WSDLPartDescriptor getDescriptor();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java
@@ -289194,7 +289194,7 @@
 +    public WSDLDescriptorKind type();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java
@@ -289266,7 +289266,7 @@
 +    @NotNull
 +    WSDLService getOwner();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java
@@ -289329,7 +289329,7 @@
 +     */
 +    public Iterable<? extends WSDLOperation> getOperations();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java
@@ -289402,7 +289402,7 @@
 +     */
 +    Iterable<? extends WSDLPort> getPorts();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/package-info.java
@@ -289453,7 +289453,7 @@
 + * apply to subpackages.
 + */
 +package com.sun.xml.internal.ws.api;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java
@@ -289567,7 +289567,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java
@@ -289841,7 +289841,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Codec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Codec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Codec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Codec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Codec.java
@@ -290084,7 +290084,7 @@
 +    XMLStreamReaderMessage decode( ReadableByteChannel in, String contentType );
 +    */
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Codecs.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Codecs.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Codecs.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Codecs.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Codecs.java
@@ -290171,7 +290171,7 @@
 +        return com.sun.xml.internal.ws.encoding.StreamSOAPCodec.create(version);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ContentType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ContentType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ContentType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ContentType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ContentType.java
@@ -290236,7 +290236,7 @@
 +     */
 +    public String getAcceptHeader();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Engine.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Engine.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Engine.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Engine.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Engine.java
@@ -290348,7 +290348,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Fiber.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Fiber.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Fiber.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Fiber.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Fiber.java
@@ -291128,7 +291128,7 @@
 +     */
 +    public static volatile boolean serializeExecution = Boolean.getBoolean(Fiber.class.getName()+".serialize");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java
@@ -291238,7 +291238,7 @@
 +        R execute(P param);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/NextAction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/NextAction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/NextAction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/NextAction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/NextAction.java
@@ -291391,7 +291391,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Pipe.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Pipe.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Pipe.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Pipe.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Pipe.java
@@ -291742,7 +291742,7 @@
 +     */
 +    Pipe copy(PipeCloner cloner);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipeCloner.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipeCloner.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipeCloner.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipeCloner.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipeCloner.java
@@ -291828,7 +291828,7 @@
 +        add((Tube)original,copy);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java
@@ -291952,7 +291952,7 @@
 +     */
 +    @NotNull Pipe createServer(@NotNull ServerPipeAssemblerContext context);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java
@@ -292053,7 +292053,7 @@
 +
 +    private static final Logger logger = Logger.getLogger(PipelineAssemblerFactory.class.getName());
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java
@@ -292099,7 +292099,7 @@
 +public interface SOAPBindingCodec extends Codec {
 +    StreamSOAPCodec getXMLCodec();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java
@@ -292219,7 +292219,7 @@
 +        return PipeAdapter.adapt(super.createWsaTube(PipeAdapter.adapt(next)));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java
@@ -292481,7 +292481,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java
@@ -292549,7 +292549,7 @@
 +     */
 +    public @NotNull Message decode(@NotNull XMLStreamReader reader, @NotNull AttachmentSet att);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Stubs.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Stubs.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Stubs.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Stubs.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Stubs.java
@@ -292807,7 +292807,7 @@
 +                new Class[]{portInterface, WSBindingProvider.class}, ps ));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java
@@ -292928,7 +292928,7 @@
 +        return PipeAdapter.adapt(TransportTubeFactory.create(classLoader,context));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java
@@ -293070,7 +293070,7 @@
 +
 +    private static final Logger logger = Logger.getLogger(TransportTubeFactory.class.getName());
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Tube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Tube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Tube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Tube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/Tube.java
@@ -293472,7 +293472,7 @@
 +     */
 +    Tube copy(TubeCloner cloner);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubeCloner.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubeCloner.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubeCloner.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubeCloner.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubeCloner.java
@@ -293590,7 +293590,7 @@
 +        master2copy.put(original,copy);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java
@@ -293699,7 +293699,7 @@
 +     */
 +    @NotNull Tube createServer(@NotNull ServerTubeAssemblerContext context);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java
@@ -293838,7 +293838,7 @@
 +
 +    private static final Logger logger = Logger.getLogger(TubelineAssemblerFactory.class.getName());
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java
@@ -293964,7 +293964,7 @@
 +        next.preDestroy();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java
@@ -294053,7 +294053,7 @@
 +        next.preDestroy();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java
@@ -294121,7 +294121,7 @@
 +        // noop
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java
@@ -294239,7 +294239,7 @@
 +
 +    public abstract AbstractTubeImpl copy(TubeCloner cloner);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java
@@ -294371,7 +294371,7 @@
 +        return super.toString()+"["+next.toString()+"]";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/helper/package-info.java
@@ -294411,7 +294411,7 @@
 +package com.sun.xml.internal.ws.api.pipe.helper;
 +
 +import com.sun.xml.internal.ws.api.pipe.Pipe;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/pipe/package-info.java
@@ -294445,7 +294445,7 @@
 + * {@link com.sun.xml.internal.ws.api.pipe.Pipe} and related abstractions.
 + */
 +package com.sun.xml.internal.ws.api.pipe;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java
@@ -294609,7 +294609,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Adapter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Adapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Adapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Adapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Adapter.java
@@ -294746,7 +294746,7 @@
 +     */
 +    protected abstract TK createToolkit();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AsyncProvider.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AsyncProvider.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AsyncProvider.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AsyncProvider.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AsyncProvider.java
@@ -294867,7 +294867,7 @@
 +        @NotNull AsyncProviderCallback<T> callback,
 +        @NotNull WebServiceContext context);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java
@@ -294937,7 +294937,7 @@
 +     */
 +    void sendError(@NotNull Throwable t);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/BoundEndpoint.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/BoundEndpoint.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/BoundEndpoint.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/BoundEndpoint.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/BoundEndpoint.java
@@ -295019,7 +295019,7 @@
 +     */
 +    @NotNull URI getAddress(String baseAddress);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Container.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Container.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Container.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Container.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Container.java
@@ -295121,7 +295121,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ContainerResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ContainerResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ContainerResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ContainerResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ContainerResolver.java
@@ -295220,7 +295220,7 @@
 +    public abstract @NotNull Container getContainer();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java
@@ -295303,7 +295303,7 @@
 +     */
 +    @Nullable String getRelativeAddressFor(@NotNull SDDocument current, @NotNull SDDocument referenced);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java
@@ -295352,7 +295352,7 @@
 +     */
 +    void setEndpoint(@NotNull WSEndpoint endpoint);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/EndpointComponent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/EndpointComponent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/EndpointComponent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/EndpointComponent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/EndpointComponent.java
@@ -295409,7 +295409,7 @@
 +     */
 +    @Nullable <T> T getSPI(@NotNull Class<T> spiType);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/HttpEndpoint.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/HttpEndpoint.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/HttpEndpoint.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/HttpEndpoint.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/HttpEndpoint.java
@@ -295476,7 +295476,7 @@
 +    public abstract void stop();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/InstanceResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/InstanceResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/InstanceResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/InstanceResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/InstanceResolver.java
@@ -295741,7 +295741,7 @@
 +        Logger.getLogger(
 +            com.sun.xml.internal.ws.util.Constants.LoggingDomain + ".server");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java
@@ -295807,7 +295807,7 @@
 +public @interface InstanceResolverAnnotation {
 +    Class<? extends InstanceResolver> value();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Invoker.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Invoker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Invoker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Invoker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Invoker.java
@@ -295938,7 +295938,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Module.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Module.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Module.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Module.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/Module.java
@@ -296016,7 +296016,7 @@
 +     */
 +    public abstract @NotNull List<BoundEndpoint> getBoundEndpoints();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/PortAddressResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/PortAddressResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/PortAddressResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/PortAddressResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/PortAddressResolver.java
@@ -296101,7 +296101,7 @@
 +        return getAddressFor(serviceName, portName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ResourceInjector.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ResourceInjector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ResourceInjector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ResourceInjector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ResourceInjector.java
@@ -296179,7 +296179,7 @@
 +     */
 +    public static final ResourceInjector STANDALONE = new DefaultResourceInjector();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocument.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocument.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocument.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocument.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocument.java
@@ -296350,7 +296350,7 @@
 +        Set<QName> getAllServices();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java
@@ -296410,7 +296410,7 @@
 +     */
 +    XMLStreamWriter filter(SDDocument doc, XMLStreamWriter w) throws XMLStreamException, IOException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocumentSource.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocumentSource.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocumentSource.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocumentSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/SDDocumentSource.java
@@ -296547,7 +296547,7 @@
 +        };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java
@@ -296651,7 +296651,7 @@
 +        return tail;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ServiceDefinition.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ServiceDefinition.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ServiceDefinition.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ServiceDefinition.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/ServiceDefinition.java
@@ -296735,7 +296735,7 @@
 +     */
 +    void addFilter(@NotNull SDDocumentFilter filter);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/TransportBackChannel.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/TransportBackChannel.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/TransportBackChannel.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/TransportBackChannel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/TransportBackChannel.java
@@ -296806,7 +296806,7 @@
 +     */
 +    void close();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WSEndpoint.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WSEndpoint.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WSEndpoint.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WSEndpoint.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WSEndpoint.java
@@ -297329,7 +297329,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java
@@ -297386,7 +297386,7 @@
 +     */
 +    @Nullable Packet getRequestPacket();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WebModule.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WebModule.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WebModule.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WebModule.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WebModule.java
@@ -297447,7 +297447,7 @@
 +     */
 +    public abstract @NotNull String getContextPath();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java
@@ -297603,7 +297603,7 @@
 +     */
 +    @Nullable String getWSDLAddress(@NotNull Packet request, @NotNull WSEndpoint endpoint);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/server/package-info.java
@@ -297639,7 +297639,7 @@
 + * If you are new to the code, start with {@link WSEndpoint}.
 + */
 +package com.sun.xml.internal.ws.api.server;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java
@@ -298084,7 +298084,7 @@
 +        return Boolean.FALSE;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java
@@ -298442,7 +298442,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java
@@ -298497,7 +298497,7 @@
 +     */
 +    public abstract @Nullable ServiceDescriptor resolve(@NotNull URI location);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java
@@ -298555,7 +298555,7 @@
 +    @NotNull
 +    MetaDataResolver metadataResolver(@Nullable EntityResolver resolver);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java
@@ -298612,7 +298612,7 @@
 +     */
 +    public abstract @NotNull List<? extends Source> getSchemas();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java
@@ -298887,7 +298887,7 @@
 +        // noop
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java
@@ -298949,7 +298949,7 @@
 +     */
 +    @NotNull Container getContainer();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java
@@ -299031,7 +299031,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java
@@ -299065,7 +299065,7 @@
 + * Extension point for WSDL parsing.
 + */
 +package com.sun.xml.internal.ws.api.wsdl.parser;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java
@@ -299160,7 +299160,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java
@@ -299435,7 +299435,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/BindingImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/BindingImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/BindingImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/BindingImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/BindingImpl.java
@@ -299624,7 +299624,7 @@
 +        features.add(newFeature);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java
@@ -299702,7 +299702,7 @@
 +                handlerChain,logicalHandlers,null,null,null);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java
@@ -299899,7 +299899,7 @@
 +
 +    private static final WebServiceFeature[] EMPTY_FEATURES = new WebServiceFeature[0];
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java
@@ -300220,7 +300220,7 @@
 +
 +    private static final Logger LOGGER = Logger.getLogger(WebServiceFeatureList.class.getName());
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/AsyncInvoker.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/AsyncInvoker.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/AsyncInvoker.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/AsyncInvoker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/AsyncInvoker.java
@@ -300290,7 +300290,7 @@
 +    public abstract void do_run();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/AsyncResponseImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/AsyncResponseImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/AsyncResponseImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/AsyncResponseImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/AsyncResponseImpl.java
@@ -300421,7 +300421,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/BindingProviderProperties.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/BindingProviderProperties.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/BindingProviderProperties.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/BindingProviderProperties.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/BindingProviderProperties.java
@@ -300477,7 +300477,7 @@
 +        "com.sun.xml.internal.ws.client.handle";
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientContainer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientContainer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientContainer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientContainer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientContainer.java
@@ -300537,7 +300537,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java
@@ -300705,7 +300705,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientTransportException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientTransportException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientTransportException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientTransportException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ClientTransportException.java
@@ -300760,7 +300760,7 @@
 +        return "com.sun.xml.internal.ws.resources.client";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ContentNegotiation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ContentNegotiation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ContentNegotiation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ContentNegotiation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ContentNegotiation.java
@@ -300842,7 +300842,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/HandlerConfiguration.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/HandlerConfiguration.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/HandlerConfiguration.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/HandlerConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/HandlerConfiguration.java
@@ -300967,7 +300967,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/HandlerConfigurator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/HandlerConfigurator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/HandlerConfigurator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/HandlerConfigurator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/HandlerConfigurator.java
@@ -301154,7 +301154,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/PortInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/PortInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/PortInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/PortInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/PortInfo.java
@@ -301329,7 +301329,7 @@
 +        return bindingId.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/RequestContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/RequestContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/RequestContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/RequestContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/RequestContext.java
@@ -301727,7 +301727,7 @@
 +
 +    private static final PropertyMap propMap = parse(RequestContext.class);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ResponseContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ResponseContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ResponseContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ResponseContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ResponseContext.java
@@ -301894,7 +301894,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ResponseContextReceiver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ResponseContextReceiver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ResponseContextReceiver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ResponseContextReceiver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/ResponseContextReceiver.java
@@ -301942,7 +301942,7 @@
 +     */
 +    void setResponseContext(ResponseContext rc);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SCAnnotations.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SCAnnotations.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SCAnnotations.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SCAnnotations.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SCAnnotations.java
@@ -302035,7 +302035,7 @@
 +    final ArrayList<Class> classes = new ArrayList<Class>();
 +    URL wsdlLocation;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SEIPortInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SEIPortInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SEIPortInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SEIPortInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SEIPortInfo.java
@@ -302108,7 +302108,7 @@
 +         return bindingImpl;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SenderException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SenderException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SenderException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SenderException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/SenderException.java
@@ -302163,7 +302163,7 @@
 +        return "com.sun.xml.internal.ws.resources.sender";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/Stub.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/Stub.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/Stub.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/Stub.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/Stub.java
@@ -302569,7 +302569,7 @@
 +        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, address);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java
@@ -303282,7 +303282,7 @@
 +
 +    private static final WebServiceFeature[] EMPTY_FEATURES = new WebServiceFeature[0];
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java
@@ -303366,7 +303366,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java
@@ -303859,7 +303859,7 @@
 +            return new SOAPSourceDispatch(port,mode,owner,pipe,binding,epr);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java
@@ -303977,7 +303977,7 @@
 +        super.setOutboundHeaders(hl);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java
@@ -304042,7 +304042,7 @@
 +        return new Packet(msg);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java
@@ -304127,7 +304127,7 @@
 +        return new Packet(message);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java
@@ -304218,7 +304218,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java
@@ -304321,7 +304321,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/package-info.java
@@ -304483,7 +304483,7 @@
 +import javax.xml.stream.XMLStreamWriter;
 +
 +import org.w3c.dom.Node;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java
@@ -304695,7 +304695,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/BodyBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/BodyBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/BodyBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/BodyBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/BodyBuilder.java
@@ -304985,7 +304985,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java
@@ -305046,7 +305046,7 @@
 +        return doInvoke(proxy, args, handler);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/MessageFiller.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/MessageFiller.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/MessageFiller.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/MessageFiller.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/MessageFiller.java
@@ -305229,7 +305229,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/MethodHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/MethodHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/MethodHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/MethodHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/MethodHandler.java
@@ -305301,7 +305301,7 @@
 +     */
 +    abstract Object invoke(Object proxy, Object[] args) throws WebServiceException, Throwable;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java
@@ -305351,7 +305351,7 @@
 +        return doInvoke(proxy,args,null);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java
@@ -306023,7 +306023,7 @@
 +        return mimeType.equals("text/xml") || mimeType.equals("application/xml");
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java
@@ -306242,7 +306242,7 @@
 +    abstract ValueGetterFactory getValueGetterFactory();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SEIStub.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SEIStub.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SEIStub.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SEIStub.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SEIStub.java
@@ -306394,7 +306394,7 @@
 +        super.setOutboundHeaders(hl);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java
@@ -306522,7 +306522,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueGetter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueGetter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueGetter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueGetter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueGetter.java
@@ -306607,7 +306607,7 @@
 +    abstract Object get(Object parameter);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java
@@ -306669,7 +306669,7 @@
 +    };
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueSetter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueSetter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueSetter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueSetter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueSetter.java
@@ -306867,7 +306867,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java
@@ -306942,7 +306942,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/pacakge-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/pacakge-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/pacakge-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/pacakge-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/sei/pacakge-info.java
@@ -306976,7 +306976,7 @@
 + * {@link SEIStub} and its supporting code.
 + */
 +package com.sun.xml.internal.ws.client.sei;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/BindingTypeFeature.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/BindingTypeFeature.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/BindingTypeFeature.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/BindingTypeFeature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/BindingTypeFeature.java
@@ -307036,7 +307036,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/EPRRecipe.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/EPRRecipe.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/EPRRecipe.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/EPRRecipe.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/EPRRecipe.java
@@ -307173,7 +307173,7 @@
 +        return this;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/JAXBContextFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/JAXBContextFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/JAXBContextFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/JAXBContextFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/JAXBContextFactory.java
@@ -307279,7 +307279,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/JAXWSProperties.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/JAXWSProperties.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/JAXWSProperties.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/JAXWSProperties.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/JAXWSProperties.java
@@ -307517,7 +307517,7 @@
 +     */
 +    public static final String REST_BINDING = "http://jax-ws.dev.java.net/rest";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java
@@ -307625,7 +307625,7 @@
 +    Validation validation() default Validation.LAX;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java
@@ -307754,7 +307754,7 @@
 +        return validation;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java
@@ -307959,7 +307959,7 @@
 +
 +    protected static final String MSNS = "http://schemas.xmlsoap.org/ws/2004/08/addressing";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/SchemaValidation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/SchemaValidation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/SchemaValidation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/SchemaValidation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/SchemaValidation.java
@@ -308056,7 +308056,7 @@
 +     */
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java
@@ -308135,7 +308135,7 @@
 +        return clazz;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/ServerSideException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/ServerSideException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/ServerSideException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/ServerSideException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/ServerSideException.java
@@ -308192,7 +308192,7 @@
 +        return (message != null) ? (s + ": " + message) : s;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/Stateful.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/Stateful.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/Stateful.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/Stateful.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/Stateful.java
@@ -308252,7 +308252,7 @@
 +@InstanceResolverAnnotation(StatefulInstanceResolver.class)
 +public @interface Stateful {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StatefulFeature.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StatefulFeature.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StatefulFeature.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StatefulFeature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StatefulFeature.java
@@ -308315,7 +308315,7 @@
 +        return ID;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StatefulWebServiceManager.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StatefulWebServiceManager.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StatefulWebServiceManager.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StatefulWebServiceManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StatefulWebServiceManager.java
@@ -308701,7 +308701,7 @@
 +        void onTimeout(@NotNull T timedOutObject, @NotNull StatefulWebServiceManager<T> manager);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingAttachment.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingAttachment.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingAttachment.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingAttachment.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingAttachment.java
@@ -308782,7 +308782,7 @@
 +    long memoryThreshold() default 1048576L;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java
@@ -308904,7 +308904,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingDataHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingDataHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingDataHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingDataHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/StreamingDataHandler.java
@@ -308978,7 +308978,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/UsesJAXBContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/UsesJAXBContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/UsesJAXBContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/UsesJAXBContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/UsesJAXBContext.java
@@ -309051,7 +309051,7 @@
 +     */
 +    Class<? extends JAXBContextFactory> value();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java
@@ -309180,7 +309180,7 @@
 +        return ID;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java
@@ -309243,7 +309243,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/WSBindingProvider.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/WSBindingProvider.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/WSBindingProvider.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/WSBindingProvider.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/WSBindingProvider.java
@@ -309368,7 +309368,7 @@
 +     */
 +    void setAddress(String address);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/developer/package-info.java
@@ -309402,7 +309402,7 @@
 + * JAX-WS RI vendor extension features that are available to the JAX-WS RI users.
 + */
 +package com.sun.xml.internal.ws.developer;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ContentType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ContentType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ContentType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ContentType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ContentType.java
@@ -309543,7 +309543,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java
@@ -309641,7 +309641,7 @@
 +        return accept;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java
@@ -309709,7 +309709,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java
@@ -310096,7 +310096,7 @@
 +        return sb.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java
@@ -310265,7 +310265,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java
@@ -310399,7 +310399,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MimeCodec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MimeCodec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MimeCodec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MimeCodec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MimeCodec.java
@@ -310606,7 +310606,7 @@
 +        out.write('\n');
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java
@@ -310819,7 +310819,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MtomCodec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MtomCodec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MtomCodec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MtomCodec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/MtomCodec.java
@@ -311379,7 +311379,7 @@
 +    private static final String XOP_NAMESPACEURI = "http://www.w3.org/2004/08/xop/include";
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ParameterList.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ParameterList.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ParameterList.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ParameterList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/ParameterList.java
@@ -311522,7 +311522,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java
@@ -311598,7 +311598,7 @@
 +     */
 +    void decode(@NotNull ReadableByteChannel in, @NotNull String contentType, @NotNull Packet packet, @NotNull AttachmentSet att);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java
@@ -312048,7 +312048,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java
@@ -312126,7 +312126,7 @@
 +        return expectedContentTypes;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java
@@ -312209,7 +312209,7 @@
 +        return expectedContentTypes;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java
@@ -312532,7 +312532,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java
@@ -312685,7 +312685,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/SwACodec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/SwACodec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/SwACodec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/SwACodec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/SwACodec.java
@@ -312771,7 +312771,7 @@
 +        return new SwACodec(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/TagInfoset.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/TagInfoset.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/TagInfoset.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/TagInfoset.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/TagInfoset.java
@@ -313000,7 +313000,7 @@
 +    private static final String[] EMPTY_ARRAY = new String[0];
 +    private static final AttributesImpl EMPTY_ATTRIBUTES = new AttributesImpl();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java
@@ -313369,7 +313369,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java
@@ -313488,7 +313488,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java
@@ -313775,7 +313775,7 @@
 +        return in;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java
@@ -313838,7 +313838,7 @@
 +     */
 +    static public final String STATEFUL_SOAP_12 = "application/vnd.sun.stateful.soap+fastinfoset";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java
@@ -313914,7 +313914,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java
@@ -313968,7 +313968,7 @@
 +        READER_FACTORY.doRecycle(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java
@@ -314042,7 +314042,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java
@@ -314117,7 +314117,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java
@@ -314300,7 +314300,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java
@@ -314361,7 +314361,7 @@
 +        return "com.sun.xml.internal.ws.resources.encoding";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java
@@ -314442,7 +314442,7 @@
 +    public final static QName FAULT_CODE_PROCEDURE_NOT_PRESENT = new QName(URI_ENVELOPE, "ProcedureNotPresent");
 +    public final static QName FAULT_CODE_BAD_ARGUMENTS      = new QName(URI_ENVELOPE, "BadArguments");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java
@@ -314508,7 +314508,7 @@
 +    public final static QName FAULT_CODE_PROCEDURE_NOT_PRESENT = new QName(URI_ENVELOPE, "ProcedureNotPresent");
 +    public final static QName FAULT_CODE_BAD_ARGUMENTS      = new QName(URI_ENVELOPE, "BadArguments");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SerializationException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SerializationException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SerializationException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SerializationException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SerializationException.java
@@ -314569,7 +314569,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java
@@ -314618,7 +314618,7 @@
 +    public static final boolean REFERENCED_INSTANCE     = true;
 +    public static final boolean UNREFERENCED_INSTANCE   = false;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java
@@ -314688,7 +314688,7 @@
 +    public static final String ATTR_ENCODING_STYLE = "encodingStyle";
 +    public static final String ATTR_NOT_UNDERSTOOD_QNAME = "qname";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java
@@ -314746,7 +314746,7 @@
 +    public static final String ATTR_MUST_UNDERSTAND = "mustUnderstand";
 +    public static final String ATTR_ENCODING_STYLE = "encodingStyle";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java
@@ -314848,7 +314848,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java
@@ -315475,7 +315475,7 @@
 +        };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/CodeType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/CodeType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/CodeType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/CodeType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/CodeType.java
@@ -315567,7 +315567,7 @@
 +        Subcode = subcode;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/DetailType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/DetailType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/DetailType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/DetailType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/DetailType.java
@@ -315654,7 +315654,7 @@
 +    DetailType() {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/ExceptionBean.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/ExceptionBean.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/ExceptionBean.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/ExceptionBean.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/ExceptionBean.java
@@ -315852,7 +315852,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/ReasonType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/ReasonType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/ReasonType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/ReasonType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/ReasonType.java
@@ -315916,7 +315916,7 @@
 +        return text;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAP11Fault.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAP11Fault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAP11Fault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAP11Fault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAP11Fault.java
@@ -316104,7 +316104,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAP12Fault.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAP12Fault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAP12Fault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAP12Fault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAP12Fault.java
@@ -316354,7 +316354,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java
@@ -316897,7 +316897,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SubcodeType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SubcodeType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SubcodeType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SubcodeType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/SubcodeType.java
@@ -316986,7 +316986,7 @@
 +        Subcode = subcode;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/TextType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/TextType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/TextType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/TextType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/fault/TextType.java
@@ -317050,7 +317050,7 @@
 +        return text;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java
@@ -317210,7 +317210,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java
@@ -317365,7 +317365,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java
@@ -317532,7 +317532,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerChainsModel.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerChainsModel.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerChainsModel.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerChainsModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerChainsModel.java
@@ -318105,7 +318105,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerException.java
@@ -318166,7 +318166,7 @@
 +        return "com.sun.xml.internal.ws.resources.handler";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerProcessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerProcessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerProcessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerProcessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerProcessor.java
@@ -318582,7 +318582,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/HandlerTube.java
@@ -318946,7 +318946,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java
@@ -319045,7 +319045,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java
@@ -319232,7 +319232,7 @@
 +    }
 +     */
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageContextImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageContextImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageContextImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageContextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageContextImpl.java
@@ -319458,7 +319458,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java
@@ -319547,7 +319547,7 @@
 +        setMessage(newMessage);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java
@@ -319698,7 +319698,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/PortInfoImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/PortInfoImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/PortInfoImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/PortInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/PortInfoImpl.java
@@ -319825,7 +319825,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java
@@ -319931,7 +319931,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java
@@ -320065,7 +320065,7 @@
 +        return roles;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java
@@ -320238,7 +320238,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java
@@ -320392,7 +320392,7 @@
 +        return new ServerMessageHandlerTube(this, cloner);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java
@@ -320562,7 +320562,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java
@@ -320637,7 +320637,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java
@@ -320784,7 +320784,7 @@
 +
 +    protected static final AttributesImpl EMPTY_ATTS = new AttributesImpl();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AbstractMessageImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AbstractMessageImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AbstractMessageImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AbstractMessageImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AbstractMessageImpl.java
@@ -321010,7 +321010,7 @@
 +    protected static final AttributesImpl EMPTY_ATTS = new AttributesImpl();
 +    protected static final LocatorImpl NULL_LOCATOR = new LocatorImpl();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AttachmentSetImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AttachmentSetImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AttachmentSetImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AttachmentSetImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AttachmentSetImpl.java
@@ -321096,7 +321096,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java
@@ -321178,7 +321178,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/ByteArrayAttachment.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/ByteArrayAttachment.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/ByteArrayAttachment.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/ByteArrayAttachment.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/ByteArrayAttachment.java
@@ -321293,7 +321293,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DOMHeader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DOMHeader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DOMHeader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DOMHeader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DOMHeader.java
@@ -321417,7 +321417,7 @@
 +        return node.getTextContent();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DOMMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DOMMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DOMMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DOMMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DOMMessage.java
@@ -321571,7 +321571,7 @@
 +        return new DOMMessage(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DataHandlerAttachment.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DataHandlerAttachment.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DataHandlerAttachment.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DataHandlerAttachment.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/DataHandlerAttachment.java
@@ -321684,7 +321684,7 @@
 +        saaj.addAttachmentPart(part);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/EmptyMessageImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/EmptyMessageImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/EmptyMessageImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/EmptyMessageImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/EmptyMessageImpl.java
@@ -321815,7 +321815,7 @@
 +        return new EmptyMessageImpl(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/FaultDetailHeader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/FaultDetailHeader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/FaultDetailHeader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/FaultDetailHeader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/FaultDetailHeader.java
@@ -321937,7 +321937,7 @@
 +        h.endElement(nsUri,ln,ln);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/FaultMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/FaultMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/FaultMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/FaultMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/FaultMessage.java
@@ -321997,7 +321997,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/JAXBAttachment.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/JAXBAttachment.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/JAXBAttachment.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/JAXBAttachment.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/JAXBAttachment.java
@@ -322128,7 +322128,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/MimeAttachmentSet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/MimeAttachmentSet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/MimeAttachmentSet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/MimeAttachmentSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/MimeAttachmentSet.java
@@ -322242,7 +322242,7 @@
 +        return atts.values().iterator();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/ProblemActionHeader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/ProblemActionHeader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/ProblemActionHeader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/ProblemActionHeader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/ProblemActionHeader.java
@@ -322382,7 +322382,7 @@
 +        h.endElement(nsUri,ln,ln);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/RelatesToHeader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/RelatesToHeader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/RelatesToHeader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/RelatesToHeader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/RelatesToHeader.java
@@ -322468,7 +322468,7 @@
 +        she.addTextNode(value);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/RootElementSniffer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/RootElementSniffer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/RootElementSniffer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/RootElementSniffer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/RootElementSniffer.java
@@ -322554,7 +322554,7 @@
 +    private static final SAXException aSAXException = new SAXException();
 +    private static final Attributes EMPTY_ATTRIBUTES = new AttributesImpl();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/StringHeader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/StringHeader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/StringHeader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/StringHeader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/StringHeader.java
@@ -322668,7 +322668,7 @@
 +        h.endElement(nsUri,ln,ln);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/Util.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/Util.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/Util.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/Util.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/Util.java
@@ -322720,7 +322720,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/XMLReaderImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/XMLReaderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/XMLReaderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/XMLReaderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/XMLReaderImpl.java
@@ -322806,7 +322806,7 @@
 +     */
 +    protected static final InputSource THE_SOURCE = new InputSource();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java
@@ -322911,7 +322911,7 @@
 +        return name + cid;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java
@@ -323041,7 +323041,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java
@@ -323246,7 +323246,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java
@@ -323576,7 +323576,7 @@
 +        return new JAXBMessage(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java
@@ -323702,7 +323702,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/jaxb/package-info.java
@@ -323746,7 +323746,7 @@
 +package com.sun.xml.internal.ws.message.jaxb;
 +
 +import com.sun.xml.internal.ws.api.message.Message;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/package-info.java
@@ -323782,7 +323782,7 @@
 +package com.sun.xml.internal.ws.message;
 +
 +import com.sun.xml.internal.ws.api.message.Message;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java
@@ -323841,7 +323841,7 @@
 +        return v;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java
@@ -324401,7 +324401,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java
@@ -324465,7 +324465,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java
@@ -324600,7 +324600,7 @@
 +        sm.writeTo(contentHandler, errorHandler);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/SourceUtils.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/SourceUtils.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/SourceUtils.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/SourceUtils.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/source/SourceUtils.java
@@ -324858,7 +324858,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java
@@ -325030,7 +325030,7 @@
 +    private static final String TRUE_VALUE = "1";
 +    private static final String IS_REFERENCE_PARAMETER = "IsReferenceParameter";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java
@@ -325151,7 +325151,7 @@
 +        return message.copy();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamAttachment.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamAttachment.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamAttachment.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamAttachment.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamAttachment.java
@@ -325264,7 +325264,7 @@
 +        saaj.addAttachmentPart(part);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader.java
@@ -325504,7 +325504,7 @@
 +        else        return s;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader11.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader11.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader11.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader11.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader11.java
@@ -325591,7 +325591,7 @@
 +        return atts;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader12.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader12.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader12.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamHeader12.java
@@ -325683,7 +325683,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/message/stream/StreamMessage.java
@@ -326186,7 +326186,7 @@
 +        DEFAULT_TAGS[base+2] = new TagInfoset(v.nsUri,"Body","S",EMPTY_ATTS);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java
@@ -326708,7 +326708,7 @@
 +
 +    private static final Logger LOGGER = Logger.getLogger(AbstractSEIModelImpl.class.getName());
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java
@@ -326832,7 +326832,7 @@
 +        this.faultAction = faultAction;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/FieldSignature.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/FieldSignature.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/FieldSignature.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/FieldSignature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/FieldSignature.java
@@ -326937,7 +326937,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/Injector.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/Injector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/Injector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/Injector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/Injector.java
@@ -327134,7 +327134,7 @@
 +        return classes.get(className);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/JavaMethodImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/JavaMethodImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/JavaMethodImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/JavaMethodImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/JavaMethodImpl.java
@@ -327473,7 +327473,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/ParameterImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/ParameterImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/ParameterImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/ParameterImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/ParameterImpl.java
@@ -327727,7 +327727,7 @@
 +        types.add(getTypeReference());
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/RuntimeModeler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/RuntimeModeler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/RuntimeModeler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/RuntimeModeler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/RuntimeModeler.java
@@ -329195,7 +329195,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/RuntimeModelerException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/RuntimeModelerException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/RuntimeModelerException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/RuntimeModelerException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/RuntimeModelerException.java
@@ -329256,7 +329256,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/SOAPSEIModel.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/SOAPSEIModel.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/SOAPSEIModel.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/SOAPSEIModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/SOAPSEIModel.java
@@ -329361,7 +329361,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java
@@ -330025,7 +330025,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/WrapperParameter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/WrapperParameter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/WrapperParameter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/WrapperParameter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/WrapperParameter.java
@@ -330134,7 +330134,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java
@@ -330209,7 +330209,7 @@
 +        this.soapAction = soapAction;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java
@@ -330353,7 +330353,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java
@@ -330436,7 +330436,7 @@
 +            return features.get(featureType);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java
@@ -330503,7 +330503,7 @@
 +        return loc;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java
@@ -330592,7 +330592,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java
@@ -331034,7 +331034,7 @@
 +        return anonymous;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java
@@ -331274,7 +331274,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java
@@ -331351,7 +331351,7 @@
 +        message = root.getMessage(messageName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java
@@ -331450,7 +331450,7 @@
 +        message = parent.getMessage(messageName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java
@@ -331516,7 +331516,7 @@
 +        return parts;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java
@@ -331754,7 +331754,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java
@@ -331902,7 +331902,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java
@@ -331989,7 +331989,7 @@
 +        message = root.getMessage(messageName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java
@@ -332048,7 +332048,7 @@
 +        return type;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java
@@ -332134,7 +332134,7 @@
 +        return descriptor;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java
@@ -332258,7 +332258,7 @@
 +        notUnderstoodExtensions.addAll(boundPortType.notUnderstoodExtensions);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java
@@ -332346,7 +332346,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java
@@ -332424,7 +332424,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java
@@ -332539,7 +332539,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java
@@ -332671,7 +332671,7 @@
 +     */
 +    void visitEnd();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java
@@ -333022,7 +333022,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java
@@ -333311,7 +333311,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java
@@ -333639,7 +333639,7 @@
 +        data = newData;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java
@@ -335683,7 +335683,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java
@@ -335914,7 +335914,7 @@
 +     */
 +    void visitEnd();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java
@@ -337293,7 +337293,7 @@
 +        pool.put12(b, s1).putShort(s2);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java
@@ -337403,7 +337403,7 @@
 +     */
 +    Edge next;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java
@@ -337502,7 +337502,7 @@
 +     */
 +    void visitEnd();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java
@@ -337806,7 +337806,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java
@@ -339243,7 +339243,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java
@@ -339348,7 +339348,7 @@
 +     */
 +    Handler next;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Item.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Item.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Item.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Item.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Item.java
@@ -339639,7 +339639,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Label.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Label.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Label.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Label.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Label.java
@@ -340200,7 +340200,7 @@
 +        return "L" + System.identityHashCode(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java
@@ -340630,7 +340630,7 @@
 +     */
 +    void visitEnd();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java
@@ -343266,7 +343266,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java
@@ -343642,7 +343642,7 @@
 +    // int GOTO_W = 200; // -
 +    // int JSR_W = 201; // -
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Type.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Type.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Type.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Type.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/org/objectweb/asm/Type.java
@@ -344471,7 +344471,7 @@
 +        return getDescriptor();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/package-info.java
@@ -344531,7 +344531,7 @@
 +package com.sun.xml.internal.ws;
 +
 +//import javax.xml.ws.Binding;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java
@@ -344628,7 +344628,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/MUTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/MUTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/MUTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/MUTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/MUTube.java
@@ -344827,7 +344827,7 @@
 +                soapVersion.faultCodeMustUnderstand);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java
@@ -344892,7 +344892,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java
@@ -344973,7 +344973,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java
@@ -345043,7 +345043,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java
@@ -345100,7 +345100,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/AddressingMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/AddressingMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/AddressingMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/AddressingMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/AddressingMessages.java
@@ -345494,7 +345494,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ClientMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ClientMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ClientMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ClientMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ClientMessages.java
@@ -345880,7 +345880,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/DispatchMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/DispatchMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/DispatchMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/DispatchMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/DispatchMessages.java
@@ -346106,7 +346106,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/EncodingMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/EncodingMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/EncodingMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/EncodingMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/EncodingMessages.java
@@ -346284,7 +346284,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/HandlerMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/HandlerMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/HandlerMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/HandlerMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/HandlerMessages.java
@@ -346414,7 +346414,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/HttpserverMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/HttpserverMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/HttpserverMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/HttpserverMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/HttpserverMessages.java
@@ -346472,7 +346472,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ModelerMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ModelerMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ModelerMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ModelerMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ModelerMessages.java
@@ -346770,7 +346770,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ProviderApiMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ProviderApiMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ProviderApiMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ProviderApiMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ProviderApiMessages.java
@@ -346936,7 +346936,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/SenderMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/SenderMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/SenderMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/SenderMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/SenderMessages.java
@@ -347030,7 +347030,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ServerMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ServerMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ServerMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ServerMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/ServerMessages.java
@@ -347801,7 +347801,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/SoapMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/SoapMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/SoapMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/SoapMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/SoapMessages.java
@@ -347919,7 +347919,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/StreamingMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/StreamingMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/StreamingMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/StreamingMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/StreamingMessages.java
@@ -348193,7 +348193,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/UtilMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/UtilMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/UtilMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/UtilMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/UtilMessages.java
@@ -348335,7 +348335,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java
@@ -348418,7 +348418,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/WsservletMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/WsservletMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/WsservletMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/WsservletMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/WsservletMessages.java
@@ -350348,7 +350348,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/XmlmessageMessages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/XmlmessageMessages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/XmlmessageMessages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/XmlmessageMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/XmlmessageMessages.java
@@ -350526,7 +350526,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/addressing.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/addressing.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/addressing.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/addressing.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/addressing.properties
@@ -350588,7 +350588,7 @@
 +invalid.addressing.header.exception=Invalid WS-Addressing header: "{0}",Reason: "{1}"
 +action.not.supported.exception=Action: "{0}" not supported
 +missing.header.exception=Missing WS-Addressing header: "{0}"
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/client.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/client.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/client.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/client.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/client.properties
@@ -350647,7 +350647,7 @@
 +failed.to.parseWithMEX=Failed to access the WSDL at: {0}. It failed with: \n\t{1}.\nRetrying with MEX gave: \n\t{2}
 +failed.to.parse=Failed to access the WSDL at: {0}. It failed with: \n\t{1}.
 +wsdl.contains.no.service=WSDL {0} contains no service definition.
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/dispatch.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/dispatch.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/dispatch.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/dispatch.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/dispatch.properties
@@ -350693,7 +350693,7 @@
 +duplicate.port=WSDLPort {0} already exists. Can not create a port of the same QName.
 +invalid.query.leading.char=Leading '?' of MessageContext.QUERY_STRING: {0} is not valid. Remove '?' and run again.
 +duplicate.port=WSDLPort {0} already exists. Can not create a port of the same QName.
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/encoding.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/encoding.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/encoding.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/encoding.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/encoding.properties
@@ -350739,7 +350739,7 @@
 +xsd.unexpectedElementName=unexpected element name: expected={0}, actual: {1}
 +
 +failed.to.read.response=Failed to read a response: {0}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/handler.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/handler.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/handler.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/handler.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/handler.properties
@@ -350776,7 +350776,7 @@
 +handler.not.valid.type= {0} does not implement one of the handler interfaces.
 +handler.messageContext.invalid.class= \"{0}\" is not an allowed value for the property \"{1}\"
 +handler.predestroy.ignore=Exception ignored from invoking handler @PreDestroy method: {0}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/httpserver.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/httpserver.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/httpserver.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/httpserver.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/httpserver.properties
@@ -350807,7 +350807,7 @@
 +#
 +
 +unexpected.http.method=Cannot handle HTTP method: {0}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/modeler.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/modeler.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/modeler.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/modeler.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/modeler.properties
@@ -350861,7 +350861,7 @@
 +
 +unable.to.create.JAXBContext=Unable to create JAXBContext
 +not.a.valid.bare.method=SEI {0} has method {1} annotated as BARE but it has more than one parameter bound to body. This is invalid. Please annotate the method with annotation: @SOAPBinding(parameterStyle=SOAPBinding.ParameterStyle.WRAPPED)
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/providerApi.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/providerApi.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/providerApi.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/providerApi.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/providerApi.properties
@@ -350902,7 +350902,7 @@
 +notfound.port.in.wsdl=Port: {0} not a valid port in Service: {1} in WSDL: {2}
 +error.wsdl= Error in parsing WSDL: {0}
 +null.epr= EndpointReference is null
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/sender.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/sender.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/sender.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/sender.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/sender.properties
@@ -350936,7 +350936,7 @@
 +sender.request.messageNotReady=message not ready to be sent
 +sender.response.cannotDecodeFaultDetail=fault detail cannot be decoded
 +sender.request.illegalValueForContentNegotiation=illegal value for content negotiation property \"{0}\"
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/server.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/server.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/server.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/server.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/server.properties
@@ -351063,7 +351063,7 @@
 +duplicate.portKnownHeader=Received SOAP message contains duplicate header: {0} for a bound parameter
 +
 +runtimemodeler.invalidannotationOnImpl=Invalid annotation: {0} on endpoint implementation class \"{1}\" - will be ignored. \"{1}\" is annotated with @WebService(endpointInterface=\"{2}\"}, it MUST NOT be annotated with {0}, to fix it - put this annotation on the SEI {2}.
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/soap.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/soap.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/soap.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/soap.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/soap.properties
@@ -351099,7 +351099,7 @@
 +soap.factory.create.err=Couldn''t create SOAP factory due to exception: {0}
 +soap.fault.create.err=Couldn''t create SOAP Fault due to exception: {0}
 +soap.version.mismatch.err=Couldn''t create SOAP message. Expecting Envelope in namespace {0}, but got {1}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/streaming.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/streaming.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/streaming.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/streaming.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/streaming.properties
@@ -351154,7 +351154,7 @@
 +fastinfoset.noImplementation=Unable to locate compatible implementation of Fast Infoset in classpath
 +
 +sourcereader.invalidSource=Unable to create reader from source \"{0}\"
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/util.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/util.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/util.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/util.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/util.properties
@@ -351192,7 +351192,7 @@
 +util.failed.to.find.handlerchain.file=Could not find handler chain file {1} for class {0}
 +util.failed.to.parse.handlerchain.file=Could not parse handler chain file {1} for class {0}
 +util.location=at line {0} of {1}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/wsdlmodel.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/wsdlmodel.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/wsdlmodel.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/wsdlmodel.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/wsdlmodel.properties
@@ -351227,7 +351227,7 @@
 +  R2001 A DESCRIPTION MUST only use the WSDL \"import\" statement to import another WSDL description.
 +wsdl.portaddress.epraddress.not.match= For Port: {0}, service location {1} does not match address {2} \
 +  in the EndpointReference
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/wsservlet.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/wsservlet.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/wsservlet.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/wsservlet.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/wsservlet.properties
@@ -351468,7 +351468,7 @@
 +html.rootPage.body3a=<p>A WSDL description of these ports is available <a href='
 +html.rootPage.body3b='>here.</a></p>
 +html.rootPage.body4=<p>This endpoint is incorrectly configured. Please check the location and contents of the configuration file.</p>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/xmlmessage.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/xmlmessage.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/xmlmessage.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/xmlmessage.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/resources/xmlmessage.properties
@@ -351509,7 +351509,7 @@
 +xml.content-type.mustbe.multipart=Content-Type needs to be Multipart/Related and with type=text/xml
 +xml.invalid.content-type=Invalid Content-Type: {0}
 +xml.Content-Type.parse.err=Error while parsing MimeHeaders for Content-Type
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java
@@ -351776,7 +351776,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java
@@ -351871,7 +351871,7 @@
 +        invokeMethod(preDestroyMethod,instance);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java
@@ -351973,7 +351973,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/DefaultResourceInjector.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/DefaultResourceInjector.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/DefaultResourceInjector.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/DefaultResourceInjector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/DefaultResourceInjector.java
@@ -352023,7 +352023,7 @@
 +            instance.getClass(),WebServiceContext.class,false).inject(instance,context);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java
@@ -352075,7 +352075,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/EndpointFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/EndpointFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/EndpointFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/EndpointFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/EndpointFactory.java
@@ -352633,7 +352633,7 @@
 +    private static final Logger logger = Logger.getLogger(
 +        com.sun.xml.internal.ws.util.Constants.LoggingDomain + ".server.endpoint");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java
@@ -352829,7 +352829,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/InvokerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/InvokerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/InvokerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/InvokerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/InvokerTube.java
@@ -353002,7 +353002,7 @@
 +    };
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/JMXAgent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/JMXAgent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/JMXAgent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/JMXAgent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/JMXAgent.java
@@ -353094,7 +353094,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/SDDocumentImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/SDDocumentImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/SDDocumentImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/SDDocumentImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/SDDocumentImpl.java
@@ -353449,7 +353449,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerPropertyConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerPropertyConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerPropertyConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerPropertyConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerPropertyConstants.java
@@ -353494,7 +353494,7 @@
 +    public static final String GET_ATTACHMENT_PROPERTY =
 +        "com.sun.xml.internal.ws.attachment.GetAttachmentContext";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerRtException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerRtException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerRtException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerRtException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerRtException.java
@@ -353550,7 +353550,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java
@@ -353874,7 +353874,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java
@@ -353998,7 +353998,7 @@
 +        return bySystemId.get(systemId);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/SingletonResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/SingletonResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/SingletonResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/SingletonResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/SingletonResolver.java
@@ -354065,7 +354065,7 @@
 +        invokeMethod(findAnnotatedMethod(singleton.getClass(),PreDestroy.class),singleton);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/StatefulInstanceResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/StatefulInstanceResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/StatefulInstanceResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/StatefulInstanceResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/StatefulInstanceResolver.java
@@ -354491,7 +354491,7 @@
 +    private static final Logger logger =
 +        Logger.getLogger(com.sun.xml.internal.ws.util.Constants.LoggingDomain + ".server");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/UnsupportedMediaException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/UnsupportedMediaException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/UnsupportedMediaException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/UnsupportedMediaException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/UnsupportedMediaException.java
@@ -354554,7 +354554,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSDLGenResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSDLGenResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSDLGenResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSDLGenResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSDLGenResolver.java
@@ -354756,7 +354756,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSDLPatcher.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSDLPatcher.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSDLPatcher.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSDLPatcher.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSDLPatcher.java
@@ -355010,7 +355010,7 @@
 +                ? null : portAddressResolver.getAddressFor(serviceName, portName.getLocalPart(), portAddress);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSEndpointImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSEndpointImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSEndpointImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSEndpointImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/WSEndpointImpl.java
@@ -355330,7 +355330,7 @@
 +        return serviceName;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/package-info.java
@@ -355483,7 +355483,7 @@
 +import javax.xml.transform.Result;
 +
 +import org.w3c.dom.Node;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java
@@ -355622,7 +355622,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java
@@ -355683,7 +355683,7 @@
 +        return SOAPFaultBuilder.createSOAPFaultMessage(soapVersion, null, e);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java
@@ -355768,7 +355768,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java
@@ -355888,7 +355888,7 @@
 +        return (mode == null) ? Service.Mode.PAYLOAD : mode.value();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java
@@ -355950,7 +355950,7 @@
 +            : new SyncProviderInvokerTube(invoker, argsBuilder);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java
@@ -356116,7 +356116,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java
@@ -356213,7 +356213,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java
@@ -356325,7 +356325,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/ActionBasedDispatcher.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/ActionBasedDispatcher.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/ActionBasedDispatcher.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/ActionBasedDispatcher.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/ActionBasedDispatcher.java
@@ -356428,7 +356428,7 @@
 +        throw new DispatchException(result);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/DispatchException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/DispatchException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/DispatchException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/DispatchException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/DispatchException.java
@@ -356477,7 +356477,7 @@
 +        this.fault = fault;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java
@@ -357127,7 +357127,7 @@
 +        return mimeType.equals("text/xml") || mimeType.equals("application/xml");
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcher.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcher.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcher.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcher.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcher.java
@@ -357184,7 +357184,7 @@
 +     */
 +    EndpointMethodHandler getEndpointMethodHandler(Packet request) throws DispatchException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java
@@ -357257,7 +357257,7 @@
 +        return dispatcherList;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java
@@ -357550,7 +357550,7 @@
 +
 +    private static final Logger LOGGER = Logger.getLogger(EndpointMethodHandler.class.getName());
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java
@@ -357852,7 +357852,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java
@@ -357980,7 +357980,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/MessageFiller.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/MessageFiller.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/MessageFiller.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/MessageFiller.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/MessageFiller.java
@@ -358163,7 +358163,7 @@
 +        return mimeType.equals("text/xml") || mimeType.equals("application/xml");
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java
@@ -358298,7 +358298,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java
@@ -358407,7 +358407,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/SOAPActionBasedDispatcher.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/SOAPActionBasedDispatcher.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/SOAPActionBasedDispatcher.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/SOAPActionBasedDispatcher.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/SOAPActionBasedDispatcher.java
@@ -358488,7 +358488,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/ValueGetter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/ValueGetter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/ValueGetter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/ValueGetter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/server/sei/ValueGetter.java
@@ -358585,7 +358585,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/spi/ProviderImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/spi/ProviderImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/spi/ProviderImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/spi/ProviderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/spi/ProviderImpl.java
@@ -358806,7 +358806,7 @@
 +        });
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/Attributes.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/Attributes.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/Attributes.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/Attributes.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/Attributes.java
@@ -358942,7 +358942,7 @@
 +     */
 +    public String getValue(String localName);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/DOMStreamReader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/DOMStreamReader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/DOMStreamReader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/DOMStreamReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/DOMStreamReader.java
@@ -359851,7 +359851,7 @@
 +        else        return s;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java
@@ -359900,7 +359900,7 @@
 +public interface MtomStreamWriter {
 +    AttachmentMarshaller getAttachmentMarshaller();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/PrefixFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/PrefixFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/PrefixFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/PrefixFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/PrefixFactory.java
@@ -359947,7 +359947,7 @@
 +     */
 +    public String getPrefix(String uri);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java
@@ -360015,7 +360015,7 @@
 +    private int _next;
 +    private Map _cachedUriToPrefixMap;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java
@@ -360154,7 +360154,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java
@@ -360220,7 +360220,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLReaderException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLReaderException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLReaderException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLReaderException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLReaderException.java
@@ -360281,7 +360281,7 @@
 +        return "com.sun.xml.internal.ws.resources.streaming";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java
@@ -360342,7 +360342,7 @@
 +        return "com.sun.xml.internal.ws.resources.streaming";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java
@@ -360799,7 +360799,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java
@@ -360860,7 +360860,7 @@
 +        return "com.sun.xml.internal.ws.resources.streaming";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java
@@ -360985,7 +360985,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java
@@ -361124,7 +361124,7 @@
 +        return copy;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/Headers.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/Headers.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/Headers.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/Headers.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/Headers.java
@@ -361345,7 +361345,7 @@
 +        return map.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java
@@ -361917,7 +361917,7 @@
 +        Logger.getLogger(
 +            com.sun.xml.internal.ws.util.Constants.LoggingDomain + ".server.http");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpAdapter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpAdapter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpAdapter.java
@@ -362612,7 +362612,7 @@
 +
 +    private static final Logger LOGGER = Logger.getLogger(HttpAdapter.class.getName());
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java
@@ -362750,7 +362750,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpDump.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpDump.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpDump.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpDump.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpDump.java
@@ -362795,7 +362795,7 @@
 +        return HttpAdapter.dump;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpDumpMBean.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpDumpMBean.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpDumpMBean.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpDumpMBean.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpDumpMBean.java
@@ -362837,7 +362837,7 @@
 +    public boolean getDump();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java
@@ -362901,7 +362901,7 @@
 +     */
 +    public abstract boolean handleMetadataRequest(@NotNull HttpAdapter adapter, @NotNull WSHTTPConnection connection) throws IOException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/ResourceLoader.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/ResourceLoader.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/ResourceLoader.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/ResourceLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/ResourceLoader.java
@@ -362978,7 +362978,7 @@
 +     */
 +    Set<String> getResourcePaths(String path);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java
@@ -363250,7 +363250,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/CookieJar.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/CookieJar.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/CookieJar.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/CookieJar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/CookieJar.java
@@ -363671,7 +363671,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java
@@ -364048,7 +364048,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpCookie.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpCookie.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpCookie.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpCookie.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpCookie.java
@@ -364313,7 +364313,7 @@
 +        return result;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java
@@ -364387,7 +364387,7 @@
 +        model = parse(HttpResponseProperties.class);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java
@@ -364657,7 +364657,7 @@
 +        dump = b;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/RfcDateParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/RfcDateParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/RfcDateParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/RfcDateParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/client/RfcDateParser.java
@@ -364776,7 +364776,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java
@@ -365088,7 +365088,7 @@
 +        return ((HttpEndpoint)actualEndpoint).getEndpointReference(clazz,referenceParameters);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java
@@ -365209,7 +365209,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java
@@ -365476,7 +365476,7 @@
 +        model = parse(ServerConnectionImpl.class);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java
@@ -365630,7 +365630,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java
@@ -365786,7 +365786,7 @@
 +        return strBuf.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ASCIIUtility.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ASCIIUtility.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ASCIIUtility.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ASCIIUtility.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ASCIIUtility.java
@@ -365938,7 +365938,7 @@
 +            out.write(buf, 0, len);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ByteArrayBuffer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ByteArrayBuffer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ByteArrayBuffer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ByteArrayBuffer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ByteArrayBuffer.java
@@ -366143,7 +366143,7 @@
 +        return new String(buf, 0, count);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ByteArrayDataSource.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ByteArrayDataSource.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ByteArrayDataSource.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ByteArrayDataSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ByteArrayDataSource.java
@@ -366223,7 +366223,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/CompletedFuture.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/CompletedFuture.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/CompletedFuture.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/CompletedFuture.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/CompletedFuture.java
@@ -366297,7 +366297,7 @@
 +        return get();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Constants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Constants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Constants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Constants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Constants.java
@@ -366342,7 +366342,7 @@
 +    public static final String LoggingDomain =
 +        "javax.enterprise.resource.webservices.jaxws";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/DOMUtil.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/DOMUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/DOMUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/DOMUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/DOMUtil.java
@@ -366610,7 +366610,7 @@
 +        return elements;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/FastInfosetReflection.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/FastInfosetReflection.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/FastInfosetReflection.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/FastInfosetReflection.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/FastInfosetReflection.java
@@ -366690,7 +366690,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/FastInfosetUtil.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/FastInfosetUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/FastInfosetUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/FastInfosetUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/FastInfosetUtil.java
@@ -366751,7 +366751,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java
@@ -366839,7 +366839,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java
@@ -367058,7 +367058,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/JAXWSUtils.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/JAXWSUtils.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/JAXWSUtils.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/JAXWSUtils.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/JAXWSUtils.java
@@ -367195,7 +367195,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/MetadataUtil.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/MetadataUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/MetadataUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/MetadataUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/MetadataUtil.java
@@ -367292,7 +367292,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NamespaceSupport.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NamespaceSupport.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NamespaceSupport.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NamespaceSupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NamespaceSupport.java
@@ -368043,7 +368043,7 @@
 +        private Context parent = null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NoCloseInputStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NoCloseInputStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NoCloseInputStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NoCloseInputStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NoCloseInputStream.java
@@ -368098,7 +368098,7 @@
 +        super.close();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NoCloseOutputStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NoCloseOutputStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NoCloseOutputStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NoCloseOutputStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/NoCloseOutputStream.java
@@ -368153,7 +368153,7 @@
 +        super.close();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Pool.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Pool.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Pool.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Pool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Pool.java
@@ -368320,7 +368320,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/QNameMap.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/QNameMap.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/QNameMap.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/QNameMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/QNameMap.java
@@ -368812,7 +368812,7 @@
 +        return buf.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ReadOnlyPropertyException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ReadOnlyPropertyException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ReadOnlyPropertyException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ReadOnlyPropertyException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ReadOnlyPropertyException.java
@@ -368867,7 +368867,7 @@
 +        return propertyName;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/RuntimeVersion.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/RuntimeVersion.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/RuntimeVersion.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/RuntimeVersion.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/RuntimeVersion.java
@@ -368939,7 +368939,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/RuntimeVersionMBean.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/RuntimeVersionMBean.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/RuntimeVersionMBean.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/RuntimeVersionMBean.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/RuntimeVersionMBean.java
@@ -368987,7 +368987,7 @@
 +    public String getVersion();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ServiceConfigurationError.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ServiceConfigurationError.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ServiceConfigurationError.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ServiceConfigurationError.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ServiceConfigurationError.java
@@ -369051,7 +369051,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ServiceFinder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ServiceFinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ServiceFinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ServiceFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/ServiceFinder.java
@@ -369434,7 +369434,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/StringUtils.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/StringUtils.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/StringUtils.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/StringUtils.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/StringUtils.java
@@ -369518,7 +369518,7 @@
 +        return new String(chars);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/UtilException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/UtilException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/UtilException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/UtilException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/UtilException.java
@@ -369579,7 +369579,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Version.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Version.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Version.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Version.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/Version.java
@@ -369665,7 +369665,7 @@
 +        return BUILD_VERSION;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/VersionUtil.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/VersionUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/VersionUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/VersionUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/VersionUtil.java
@@ -369837,7 +369837,7 @@
 +    // the latest version is default
 +    public static final String JAXWS_VERSION_DEFAULT = JAXWS_VERSION_20;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java
@@ -369959,7 +369959,7 @@
 +        return msg.getResourceBundleName();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java
@@ -370070,7 +370070,7 @@
 +        return loc;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/Localizable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/Localizable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/Localizable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/Localizable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/Localizable.java
@@ -370138,7 +370138,7 @@
 +     */
 +    public static final String NOT_LOCALIZABLE = new String("\u0000");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableImpl.java
@@ -370198,7 +370198,7 @@
 +        return resourceBundleName;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableMessage.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableMessage.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableMessage.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableMessage.java
@@ -370259,7 +370259,7 @@
 +        return _bundlename;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableMessageFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableMessageFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableMessageFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableMessageFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/LocalizableMessageFactory.java
@@ -370307,7 +370307,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/Localizer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/Localizer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/Localizer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/Localizer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/Localizer.java
@@ -370461,7 +370461,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/NullLocalizable.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/NullLocalizable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/NullLocalizable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/NullLocalizable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/localization/NullLocalizable.java
@@ -370517,7 +370517,7 @@
 +        return "";
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java
@@ -370783,7 +370783,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/DumpTube.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/DumpTube.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/DumpTube.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/DumpTube.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/DumpTube.java
@@ -370933,7 +370933,7 @@
 +
 +    private static boolean warnStaxUtils;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java
@@ -371029,7 +371029,7 @@
 +        dump = b;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java
@@ -371127,7 +371127,7 @@
 +        dump = b;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/resources/Messages_en.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/resources/Messages_en.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/resources/Messages_en.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/resources/Messages_en.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/resources/Messages_en.properties
@@ -371375,7 +371375,7 @@
 +V-039 = IDREFS attributes must have at least one value
 +
 +V-040 = ENTITIES attributes must have at least one value
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/version.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/version.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/version.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/version.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/version.properties
@@ -371409,7 +371409,7 @@
 +build-id=JAX-WS RI 2.1.6
 +major-version=2.1.6
 +build-version=JAX-WS RI 2.1.6
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/CDATA.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/CDATA.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/CDATA.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/CDATA.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/CDATA.java
@@ -371472,7 +371472,7 @@
 +
 +    private String _text;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java
@@ -371760,7 +371760,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/DummyLocation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/DummyLocation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/DummyLocation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/DummyLocation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/DummyLocation.java
@@ -371820,7 +371820,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/MetadataDocument.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/MetadataDocument.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/MetadataDocument.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/MetadataDocument.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/MetadataDocument.java
@@ -372142,7 +372142,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java
@@ -372208,7 +372208,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/NodeListIterator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/NodeListIterator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/NodeListIterator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/NodeListIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/NodeListIterator.java
@@ -372274,7 +372274,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/StAXResult.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/StAXResult.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/StAXResult.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/StAXResult.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/StAXResult.java
@@ -372368,7 +372368,7 @@
 +        super.setHandler(new ContentHandlerToXMLStreamWriter( writer ));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/StAXSource.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/StAXSource.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/StAXSource.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/StAXSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/StAXSource.java
@@ -372656,7 +372656,7 @@
 +//    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java
@@ -372900,7 +372900,7 @@
 +        return reader.getAttributeValue(namespaceURI, localName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java
@@ -373128,7 +373128,7 @@
 +        else            return s;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java
@@ -373316,7 +373316,7 @@
 +        writer = null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XmlUtil.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XmlUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XmlUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XmlUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XmlUtil.java
@@ -373633,7 +373633,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java
@@ -373816,7 +373816,7 @@
 +        core.postFinished(context);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java
@@ -373888,7 +373888,7 @@
 +                new TidyXMLStreamReader(XMLStreamReaderFactory.create(url.toExternalForm(), stream, true), stream));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java
@@ -373933,7 +373933,7 @@
 +     */
 +    void error( Throwable e );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java
@@ -374068,7 +374068,7 @@
 +        return post(pre(reader),reader,super.bindingOperationFaultElements(fault, reader));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java
@@ -374164,7 +374164,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java
@@ -374209,7 +374209,7 @@
 +    public static QName QNAME_PART = new QName(NS_WSDL_MIME, "part");
 +    public static QName QNAME_MIME_XML = new QName(NS_WSDL_MIME, "mimeXml");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java
@@ -374335,7 +374335,7 @@
 +        return AddressingVersion.MEMBER.wsdlNsUri;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java
@@ -374419,7 +374419,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java
@@ -374532,7 +374532,7 @@
 +        else return s;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java
@@ -375340,7 +375340,7 @@
 +
 +    private static final Logger LOGGER = Logger.getLogger(RuntimeWSDLParser.class.getName());
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java
@@ -375417,7 +375417,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java
@@ -375528,7 +375528,7 @@
 +        return METADATA_WSDL_EXTN_NS;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java
@@ -375815,7 +375815,7 @@
 +    protected static final String COLON_DELIMITER = ":";
 +    protected static final String SLASH_DELIMITER = "/";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java
@@ -375902,7 +375902,7 @@
 +
 +    //public static final QName QNAME_ATTR_ARRAY_TYPE = new QName(NS_WSDL, "arrayType");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java
@@ -375970,7 +375970,7 @@
 +        return this.container;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java
@@ -376322,7 +376322,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java
@@ -376369,7 +376369,7 @@
 +    @XmlAttribute(value = "required", ns = "http://schemas.xmlsoap.org/wsdl/")
 +    public void required(boolean b);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java
@@ -376529,7 +376529,7 @@
 +    }
 +     private static final Logger LOGGER = Logger.getLogger(W3CAddressingWSDLGeneratorExtension.class.getName());
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java
@@ -377691,7 +377691,7 @@
 +        extensionHandlers.add(h);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java
@@ -377839,7 +377839,7 @@
 +            e.addOperationFaultExtension(fault, method, ce);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java
@@ -377919,7 +377919,7 @@
 +    public @Nullable Result getSchemaOutput(@NotNull String namespace, @NotNull Holder<String> filename);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java
@@ -377982,7 +377982,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.soap12.SOAPBinding soap12Binding();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java
@@ -378048,7 +378048,7 @@
 +    public StartWithExtensionsType input();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java
@@ -378118,7 +378118,7 @@
 +    public Import _import();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java
@@ -378165,7 +378165,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.Documented documentation(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java
@@ -378215,7 +378215,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.Fault name(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java
@@ -378263,7 +378263,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.FaultType name(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Import.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Import.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Import.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Import.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Import.java
@@ -378316,7 +378316,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.Import namespace(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Message.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Message.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Message.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Message.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Message.java
@@ -378368,7 +378368,7 @@
 +    public Part part();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java
@@ -378408,7 +378408,7 @@
 + */
 +public interface OpenAtts extends TypedXmlWriter, Documented {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java
@@ -378481,7 +378481,7 @@
 +    @XmlAttribute
 +    public com.sun.xml.internal.ws.wsdl.writer.document.Operation parameterOrder(String value);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java
@@ -378533,7 +378533,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.ParamType name(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Part.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Part.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Part.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Part.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Part.java
@@ -378590,7 +378590,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.Part name(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Port.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Port.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Port.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Port.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Port.java
@@ -378647,7 +378647,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.Port binding(QName value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java
@@ -378701,7 +378701,7 @@
 +    public Operation operation();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Service.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Service.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Service.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Service.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Service.java
@@ -378755,7 +378755,7 @@
 +    public Port port();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java
@@ -378796,7 +378796,7 @@
 + */
 +public interface StartWithExtensionsType extends TypedXmlWriter, Documented {
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Types.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Types.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Types.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Types.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/Types.java
@@ -378843,7 +378843,7 @@
 +    @XmlElement(value="schema",ns="http://www.w3.org/2001/XMLSchema")
 +    public Schema schema();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java
@@ -378894,7 +378894,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.http.Address location(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java
@@ -378945,7 +378945,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.http.Binding verb(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java
@@ -378996,7 +378996,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.http.Operation location(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java
@@ -379034,7 +379034,7 @@
 + */
 +@com.sun.xml.internal.txw2.annotation.XmlNamespace("http://schemas.xmlsoap.org/wsdl/http/")
 +package com.sun.xml.internal.ws.wsdl.writer.document.http;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java
@@ -379070,7 +379070,7 @@
 + */
 +@com.sun.xml.internal.txw2.annotation.XmlNamespace("http://schemas.xmlsoap.org/wsdl/")
 +package com.sun.xml.internal.ws.wsdl.writer.document;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java
@@ -379116,7 +379116,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java
@@ -379172,7 +379172,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.soap.BodyType parts(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java
@@ -379230,7 +379230,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.soap.BodyType part(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java
@@ -379281,7 +379281,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.soap.HeaderFault message(QName value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java
@@ -379330,7 +379330,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.soap.SOAPAddress location(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java
@@ -379382,7 +379382,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.soap.SOAPBinding style(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java
@@ -379430,7 +379430,7 @@
 +   public SOAPFault name(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java
@@ -379482,7 +379482,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.soap.SOAPOperation style(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java
@@ -379518,7 +379518,7 @@
 + */
 +@com.sun.xml.internal.txw2.annotation.XmlNamespace("http://schemas.xmlsoap.org/wsdl/soap/")
 +package com.sun.xml.internal.ws.wsdl.writer.document.soap;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java
@@ -379563,7 +379563,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java
@@ -379619,7 +379619,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.soap12.BodyType parts(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java
@@ -379675,7 +379675,7 @@
 +    public BodyType part(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java
@@ -379725,7 +379725,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.soap12.HeaderFault message(QName value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java
@@ -379774,7 +379774,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.soap12.SOAPAddress location(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java
@@ -379826,7 +379826,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.soap12.SOAPBinding style(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java
@@ -379873,7 +379873,7 @@
 +   public SOAPFault name(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java
@@ -379925,7 +379925,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.soap12.SOAPOperation style(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java
@@ -379961,7 +379961,7 @@
 + */
 +@com.sun.xml.internal.txw2.annotation.XmlNamespace("http://schemas.xmlsoap.org/wsdl/soap12/")
 +package com.sun.xml.internal.ws.wsdl.writer.document.soap12;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java
@@ -380015,7 +380015,7 @@
 +    public com.sun.xml.internal.ws.wsdl.writer.document.xsd.Import namespace(String value);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java
@@ -380065,7 +380065,7 @@
 +    @XmlElement("import")
 +    public Import _import();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java b/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java
@@ -380101,7 +380101,7 @@
 + */
 +@com.sun.xml.internal.txw2.annotation.XmlNamespace("http://www.w3.org/2001/XMLSchema")
 +package com.sun.xml.internal.ws.wsdl.writer.document.xsd;
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/ForeignAttributes.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/ForeignAttributes.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/ForeignAttributes.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/ForeignAttributes.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/ForeignAttributes.java
@@ -380167,7 +380167,7 @@
 +     */
 +    Locator getLocator();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/SCD.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/SCD.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/SCD.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/SCD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/SCD.java
@@ -380348,7 +380348,7 @@
 +     */
 +    public abstract String toString();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAnnotation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAnnotation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAnnotation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAnnotation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAnnotation.java
@@ -380417,7 +380417,7 @@
 +     */
 +    Locator getLocator();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttContainer.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttContainer.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttContainer.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttContainer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttContainer.java
@@ -380522,7 +380522,7 @@
 +     */
 +    Collection<? extends XSAttGroupDecl> getAttGroups();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttGroupDecl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttGroupDecl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttGroupDecl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttGroupDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttGroupDecl.java
@@ -380564,7 +380564,7 @@
 +public interface XSAttGroupDecl extends XSAttContainer {
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttributeDecl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttributeDecl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttributeDecl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttributeDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttributeDecl.java
@@ -380610,7 +380610,7 @@
 +    XmlString getDefaultValue();
 +    XmlString getFixedValue();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttributeUse.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttributeUse.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttributeUse.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttributeUse.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSAttributeUse.java
@@ -380672,7 +380672,7 @@
 +     */
 +    XmlString getFixedValue();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSComplexType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSComplexType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSComplexType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSComplexType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSComplexType.java
@@ -380797,7 +380797,7 @@
 +    public List<XSElementDecl> getElementDecls();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSComponent.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSComponent.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSComponent.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSComponent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSComponent.java
@@ -380973,7 +380973,7 @@
 +     */
 +    <T> T apply( XSFunction<T> function );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSContentType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSContentType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSContentType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSContentType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSContentType.java
@@ -381034,7 +381034,7 @@
 +    <T> T apply( XSContentTypeFunction<T> function );
 +    void visit( XSContentTypeVisitor visitor );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSDeclaration.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSDeclaration.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSDeclaration.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSDeclaration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSDeclaration.java
@@ -381108,7 +381108,7 @@
 +     */
 +    boolean isLocal();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSElementDecl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSElementDecl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSElementDecl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSElementDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSElementDecl.java
@@ -381269,7 +381269,7 @@
 +
 +    Boolean getForm();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSFacet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSFacet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSFacet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSFacet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSFacet.java
@@ -381334,7 +381334,7 @@
 +    final static String FACET_MAXEXCLUSIVE      = "maxExclusive";
 +    final static String FACET_WHITESPACE        = "whiteSpace";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSIdentityConstraint.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSIdentityConstraint.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSIdentityConstraint.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSIdentityConstraint.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSIdentityConstraint.java
@@ -381441,7 +381441,7 @@
 +     */
 +    XSIdentityConstraint getReferencedKey();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSListSimpleType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSListSimpleType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSListSimpleType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSListSimpleType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSListSimpleType.java
@@ -381484,7 +381484,7 @@
 +{
 +    XSSimpleType getItemType();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSModelGroup.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSModelGroup.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSModelGroup.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSModelGroup.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSModelGroup.java
@@ -381576,7 +381576,7 @@
 +     */
 +    XSParticle[] getChildren();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSModelGroupDecl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSModelGroupDecl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSModelGroupDecl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSModelGroupDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSModelGroupDecl.java
@@ -381623,7 +381623,7 @@
 +     */
 +    XSModelGroup getModelGroup();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSNotation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSNotation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSNotation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSNotation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSNotation.java
@@ -381666,7 +381666,7 @@
 +    String getPublicId();
 +    String getSystemId();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSParticle.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSParticle.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSParticle.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSParticle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSParticle.java
@@ -381726,7 +381726,7 @@
 +
 +    XSTerm getTerm();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java
@@ -381812,7 +381812,7 @@
 +     */
 +    List<XSFacet> getDeclaredFacets( String name );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSchema.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSchema.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSchema.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSchema.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSchema.java
@@ -381957,7 +381957,7 @@
 +     */
 +    XSSchemaSet getRoot();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSchemaSet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSchemaSet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSchemaSet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSchemaSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSchemaSet.java
@@ -382078,7 +382078,7 @@
 +     */
 +    XSComponent selectSingle(String scd, NamespaceContext nsContext);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSimpleType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSimpleType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSimpleType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSimpleType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSSimpleType.java
@@ -382246,7 +382246,7 @@
 +    XSListSimpleType asList();
 +    XSUnionSimpleType asUnion();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSTerm.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSTerm.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSTerm.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSTerm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSTerm.java
@@ -382322,7 +382322,7 @@
 +    XSModelGroup asModelGroup();
 +    XSElementDecl asElementDecl();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSType.java
@@ -382424,7 +382424,7 @@
 +     */
 +    boolean isDerivedFrom( XSType t );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSUnionSimpleType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSUnionSimpleType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSUnionSimpleType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSUnionSimpleType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSUnionSimpleType.java
@@ -382468,7 +382468,7 @@
 +    XSSimpleType getMember(int idx);
 +    int getMemberSize();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSVariety.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSVariety.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSVariety.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSVariety.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSVariety.java
@@ -382516,7 +382516,7 @@
 +    private final String name;
 +    public String toString() { return name; }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSWildcard.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSWildcard.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSWildcard.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSWildcard.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSWildcard.java
@@ -382617,7 +382617,7 @@
 +        Collection<String> getNamespaces();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSXPath.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSXPath.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSXPath.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSXPath.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XSXPath.java
@@ -382673,7 +382673,7 @@
 +     */
 +    XmlString getXPath();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XmlString.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XmlString.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XmlString.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XmlString.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/XmlString.java
@@ -382795,7 +382795,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AnnotationImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AnnotationImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AnnotationImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AnnotationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AnnotationImpl.java
@@ -382880,7 +382880,7 @@
 +
 +    private static final LocatorImplUnmodifiable NULL_LOCATION = new LocatorImplUnmodifiable();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java
@@ -382971,7 +382971,7 @@
 +        return function.attGroupDecl(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java
@@ -383050,7 +383050,7 @@
 +    // Ref.Attribute implementation
 +    public XSAttributeDecl getAttribute() { return this; }
 + }
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java
@@ -383129,7 +383129,7 @@
 +        v.attributeUse(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributesHolder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributesHolder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributesHolder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributesHolder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/AttributesHolder.java
@@ -383264,7 +383264,7 @@
 +        };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java
@@ -383569,7 +383569,7 @@
 +        return declList;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ComponentImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ComponentImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ComponentImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ComponentImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ComponentImpl.java
@@ -383718,7 +383718,7 @@
 +        return apply(new ComponentNameFunction());
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Const.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Const.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Const.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Const.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Const.java
@@ -383756,7 +383756,7 @@
 +    /** Namespace URI of XML Schema. */
 +    public static final String schemaNamespace = "http://www.w3.org/2001/XMLSchema";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java
@@ -383801,7 +383801,7 @@
 +public interface ContentTypeImpl extends Ref.ContentType, XSContentType {
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/DeclarationImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/DeclarationImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/DeclarationImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/DeclarationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/DeclarationImpl.java
@@ -383864,7 +383864,7 @@
 +    public final boolean isGlobal() { return !isAnonymous(); }
 +    public final boolean isLocal() { return isAnonymous(); }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ElementDecl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ElementDecl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ElementDecl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ElementDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ElementDecl.java
@@ -384104,7 +384104,7 @@
 +    // Ref.Term implementation
 +    public XSTerm getTerm() { return this; }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/EmptyImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/EmptyImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/EmptyImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/EmptyImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/EmptyImpl.java
@@ -384172,7 +384172,7 @@
 +
 +    public XSContentType getContentType() { return this; }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/FacetImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/FacetImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/FacetImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/FacetImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/FacetImpl.java
@@ -384240,7 +384240,7 @@
 +        return function.facet(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java
@@ -384304,7 +384304,7 @@
 +        return locator;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java
@@ -384425,7 +384425,7 @@
 +        return this;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java
@@ -384507,7 +384507,7 @@
 +    public boolean isList() { return true; }
 +    public XSListSimpleType asList() { return this; }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java
@@ -384612,7 +384612,7 @@
 +    // Ref.Term implementation
 +    public XSTerm getTerm() { return this; }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java
@@ -384732,7 +384732,7 @@
 +    // Ref.Term implementation
 +    public XSTerm getTerm() { return this; }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/NotationImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/NotationImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/NotationImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/NotationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/NotationImpl.java
@@ -384802,7 +384802,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ParticleImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ParticleImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ParticleImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ParticleImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/ParticleImpl.java
@@ -384919,7 +384919,7 @@
 +        return getTerm().getForeignAttributes();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Ref.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Ref.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Ref.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Ref.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Ref.java
@@ -385024,7 +385024,7 @@
 +//            throw new InternalError("assertion failed");
 +//    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java
@@ -385150,7 +385150,7 @@
 +    public boolean isRestriction() { return true; }
 +    public XSRestrictionSimpleType asRestriction() { return this; }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SchemaImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SchemaImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SchemaImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SchemaImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SchemaImpl.java
@@ -385465,7 +385465,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java
@@ -385865,7 +385865,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java
@@ -386036,7 +386036,7 @@
 +    // Ref.SimpleType implementation
 +    public XSSimpleType getType() { return this; }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/UName.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/UName.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/UName.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/UName.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/UName.java
@@ -386146,7 +386146,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java
@@ -386249,7 +386249,7 @@
 +    public boolean isUnion() { return true; }
 +    public XSUnionSimpleType asUnion() { return this; }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Util.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Util.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Util.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Util.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/Util.java
@@ -386355,7 +386355,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/WildcardImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/WildcardImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/WildcardImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/WildcardImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/WildcardImpl.java
@@ -386560,7 +386560,7 @@
 +    // Ref.Term implementation
 +    public XSTerm getTerm() { return this; }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/XPathImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/XPathImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/XPathImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/XPathImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/XPathImpl.java
@@ -386632,7 +386632,7 @@
 +        return function.xpath(this);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/package.html
@@ -386664,7 +386664,7 @@
 +<html><body>
 +Implementation of the <code>com.sun.xml.internal.xsom</code> package.
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java
@@ -386735,7 +386735,7 @@
 +            ((Patch) baseType).run();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java
@@ -386801,7 +386801,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java
@@ -387063,7 +387063,7 @@
 +        public XSIdentityConstraint get() { return (XSIdentityConstraint)super._get(); }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages.java
@@ -387149,7 +387149,7 @@
 +    public static final String ERR_SIMPLE_CONTENT_EXPECTED =
 +        "SimpleContentExpected"; // arg:2
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages.properties
@@ -387226,7 +387226,7 @@
 +
 +SimpleContentExpected = \
 +  A complex type with a simple content or a simple type is expected but found ''{0}'':{1}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties
@@ -387300,7 +387300,7 @@
 +
 +EntityResolutionFailure = \
 +        ''{0}''\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093: {1}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java
@@ -387814,7 +387814,7 @@
 +
 +    public static final String XMLSchemaNSURI = "http://www.w3.org/2001/XMLSchema";
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/ParserContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/ParserContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/ParserContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/ParserContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/ParserContext.java
@@ -388031,7 +388031,7 @@
 +        }
 +    };
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Patch.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Patch.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Patch.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Patch.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/Patch.java
@@ -388075,7 +388075,7 @@
 +public interface Patch {
 +    void run() throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java
@@ -388133,7 +388133,7 @@
 +        void run() throws SAXException;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java
@@ -388248,7 +388248,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java
@@ -388378,7 +388378,7 @@
 +        return schemaDocumentURI.hashCode()^this.schema.hashCode();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java
@@ -388431,7 +388431,7 @@
 +        return e.get().getType();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd
@@ -388799,7 +388799,7 @@
 +
 +</xs:schema>
 +
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/package.html
@@ -388831,7 +388831,7 @@
 +<html><body>
 +Parser that reads XML Schema documents and builds an <code>XSSchemaSet</code> object.
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java
@@ -389461,7 +389461,7 @@
 +}
 +
 +// end of AttributesImpl.java
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java
@@ -389507,7 +389507,7 @@
 +    void enterAttribute(String uri, String localName, String qname) throws SAXException;
 +    void leaveAttribute(String uri, String localName, String qname) throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java
@@ -389561,7 +389561,7 @@
 +    void sendLeaveAttribute( int receiverThreadId, String uri, String local, String qname ) throws SAXException;
 +    void sendText( int receiverThreadId, String value ) throws SAXException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java
@@ -389756,7 +389756,7 @@
 +        getRuntime().unexpectedX("/@"+qname);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java
@@ -390110,7 +390110,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java
@@ -390669,7 +390669,7 @@
 +        needIndent=true;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/Schema.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/Schema.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/Schema.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/Schema.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/Schema.java
@@ -391988,7 +391988,7 @@
 +      private Locator locator;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java
@@ -392381,7 +392381,7 @@
 +                private Locator lloc;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java
@@ -392875,7 +392875,7 @@
 +                private Locator rloc;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java
@@ -393343,7 +393343,7 @@
 +                private Locator uloc;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/annotation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/annotation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/annotation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/annotation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/annotation.java
@@ -393560,7 +393560,7 @@
 +      }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java
@@ -394105,7 +394105,7 @@
 +      private Ref.SimpleType type;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java
@@ -394567,7 +394567,7 @@
 +      private Locator locator;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java
@@ -395532,7 +395532,7 @@
 +      private Locator locator;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/complexType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/complexType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/complexType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/complexType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/complexType.java
@@ -397538,7 +397538,7 @@
 +      }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java
@@ -397797,7 +397797,7 @@
 +      private ContentTypeImpl particle;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java
@@ -398979,7 +398979,7 @@
 +      }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/erSet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/erSet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/erSet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/erSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/erSet.java
@@ -399166,7 +399166,7 @@
 +      }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java
@@ -399355,7 +399355,7 @@
 +      }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/facet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/facet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/facet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/facet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/facet.java
@@ -399759,7 +399759,7 @@
 +                private Locator locator;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java
@@ -399931,7 +399931,7 @@
 +      }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/group.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/group.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/group.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/group.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/group.java
@@ -400385,7 +400385,7 @@
 +                private String compositorName;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java
@@ -400982,7 +400982,7 @@
 +      }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java
@@ -401359,7 +401359,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java
@@ -401650,7 +401650,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java
@@ -402023,7 +402023,7 @@
 +                private final List particles = new ArrayList();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/notation.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/notation.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/notation.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/notation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/notation.java
@@ -402496,7 +402496,7 @@
 +      }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/occurs.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/occurs.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/occurs.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/occurs.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/occurs.java
@@ -402824,7 +402824,7 @@
 +      int min=1;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/particle.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/particle.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/particle.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/particle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/particle.java
@@ -403840,7 +403840,7 @@
 +      private String compositorName;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/qname.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/qname.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/qname.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/qname.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/qname.java
@@ -404013,7 +404013,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/qualification.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/qualification.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/qualification.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/qualification.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/qualification.java
@@ -404194,7 +404194,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/redefine.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/redefine.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/redefine.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/redefine.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/redefine.java
@@ -404649,7 +404649,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java
@@ -405156,7 +405156,7 @@
 +      }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java
@@ -405605,7 +405605,7 @@
 +      }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/xpath.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/xpath.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/xpath.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/xpath.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/parser/state/xpath.java
@@ -405924,7 +405924,7 @@
 +      }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java
@@ -406116,7 +406116,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Axis.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Axis.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Axis.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Axis.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Axis.java
@@ -406700,7 +406700,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Iterators.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Iterators.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Iterators.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Iterators.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Iterators.java
@@ -406920,7 +406920,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/ParseException.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/ParseException.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/ParseException.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/ParseException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/ParseException.java
@@ -407143,7 +407143,7 @@
 +   }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java
@@ -407232,7 +407232,7 @@
 +        return text;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParser.java
@@ -407798,7 +407798,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java
@@ -407901,7 +407901,7 @@
 +         "\"0\"",
 +       }));
 +  }
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java
@@ -410363,7 +410363,7 @@
 +}
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java
@@ -410831,7 +410831,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Step.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Step.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Step.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Step.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Step.java
@@ -411023,7 +411023,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Token.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Token.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Token.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Token.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/Token.java
@@ -411133,7 +411133,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java
@@ -411295,7 +411295,7 @@
 +      this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
 +   }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java
@@ -411344,7 +411344,7 @@
 +    }
 +    public void warning( SAXParseException e ) {}
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java
@@ -411391,7 +411391,7 @@
 +        return new InputSource(base.getResourceAsStream(systemId));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java
@@ -412402,7 +412402,7 @@
 +    public void xpath(XSXPath xp) {
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java
@@ -413014,7 +413014,7 @@
 +
 +    public void empty( XSContentType t ) {}
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/Uri.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/Uri.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/Uri.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/Uri.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/impl/util/Uri.java
@@ -413204,7 +413204,7 @@
 +    return true;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/package.html
@@ -413236,7 +413236,7 @@
 +<html><body>
 +Interfaces that the client should use to access schema information.
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationContext.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationContext.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationContext.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationContext.java
@@ -413318,7 +413318,7 @@
 +    public static final AnnotationContext ATTRIBUTE_DECL
 +        = new AnnotationContext("attributeDecl");
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationParser.java
@@ -413405,7 +413405,7 @@
 +     */
 +    public abstract Object getResult( Object existing );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java
@@ -413446,7 +413446,7 @@
 +public interface AnnotationParserFactory {
 +    AnnotationParser create();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/JAXPParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/JAXPParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/JAXPParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/JAXPParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/JAXPParser.java
@@ -413617,7 +413617,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/SchemaDocument.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/SchemaDocument.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/SchemaDocument.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/SchemaDocument.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/SchemaDocument.java
@@ -413764,7 +413764,7 @@
 +     */
 +    Set<SchemaDocument> getReferers();
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/XMLParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/XMLParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/XMLParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/XMLParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/XMLParser.java
@@ -413837,7 +413837,7 @@
 +
 +        throws SAXException, IOException;
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/XSOMParser.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/XSOMParser.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/XSOMParser.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/XSOMParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/XSOMParser.java
@@ -414111,7 +414111,7 @@
 +        return apFactory;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/parser/package.html
@@ -414143,7 +414143,7 @@
 +<html><body>
 +Classes to parse XML Schema documents into objects of <code>com.sun.xml.internal.xsom</code> package.
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/ComponentNameFunction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/ComponentNameFunction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/ComponentNameFunction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/ComponentNameFunction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/ComponentNameFunction.java
@@ -414339,7 +414339,7 @@
 +        return nameGetter.xpath(xpath);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/DeferedCollection.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/DeferedCollection.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/DeferedCollection.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/DeferedCollection.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/DeferedCollection.java
@@ -414502,7 +414502,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java
@@ -414609,7 +414609,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/NameGetter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/NameGetter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/NameGetter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/NameGetter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/NameGetter.java
@@ -414779,7 +414779,7 @@
 +        return rb.getString(key);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/NameGetter.properties b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/NameGetter.properties
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/NameGetter.properties openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/NameGetter.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/NameGetter.properties
@@ -414826,7 +414826,7 @@
 +notation                = notation declaration
 +idConstraint    = identity constraint
 +xpath           = xpath
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/SimpleTypeSet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/SimpleTypeSet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/SimpleTypeSet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/SimpleTypeSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/SimpleTypeSet.java
@@ -414887,7 +414887,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/TypeClosure.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/TypeClosure.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/TypeClosure.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/TypeClosure.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/TypeClosure.java
@@ -414959,7 +414959,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/TypeSet.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/TypeSet.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/TypeSet.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/TypeSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/TypeSet.java
@@ -415044,7 +415044,7 @@
 +        };
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/XSFinder.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/XSFinder.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/XSFinder.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/XSFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/XSFinder.java
@@ -415231,7 +415231,7 @@
 +        return Boolean.FALSE;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/XSFunctionFilter.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/XSFunctionFilter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/XSFunctionFilter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/XSFunctionFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/util/XSFunctionFilter.java
@@ -415373,7 +415373,7 @@
 +        return core.xpath(xpath);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java
@@ -415421,7 +415421,7 @@
 +    T particle( XSParticle particle );
 +    T empty( XSContentType empty );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java
@@ -415469,7 +415469,7 @@
 +    void particle( XSParticle particle );
 +    void empty( XSContentType empty );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSFunction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSFunction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSFunction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSFunction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSFunction.java
@@ -415535,7 +415535,7 @@
 +    T identityConstraint(XSIdentityConstraint decl);
 +    T xpath(XSXPath xpath);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java
@@ -415584,7 +415584,7 @@
 +    T unionSimpleType( XSUnionSimpleType type );
 +    T restrictionSimpleType( XSRestrictionSimpleType type );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java
@@ -415633,7 +415633,7 @@
 +    void unionSimpleType( XSUnionSimpleType type );
 +    void restrictionSimpleType( XSRestrictionSimpleType type );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermFunction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermFunction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermFunction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermFunction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermFunction.java
@@ -415684,7 +415684,7 @@
 +    T modelGroup( XSModelGroup group );
 +    T elementDecl( XSElementDecl decl );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java
@@ -415734,7 +415734,7 @@
 +    T modelGroup( XSModelGroup group, P param );
 +    T elementDecl( XSElementDecl decl, P param );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java
@@ -415784,7 +415784,7 @@
 +    void modelGroup( XSModelGroup group );
 +    void elementDecl( XSElementDecl decl );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSVisitor.java
@@ -415846,7 +415846,7 @@
 +    void identityConstraint( XSIdentityConstraint decl);
 +    void xpath(XSXPath xp);
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java
@@ -415892,7 +415892,7 @@
 +    T other( XSWildcard.Other wc );
 +    T union( XSWildcard.Union wc );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java
@@ -415938,7 +415938,7 @@
 +    void other( XSWildcard.Other wc );
 +    void union( XSWildcard.Union wc );
 +}
-diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/package.html b/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/package.html
+diff --git a/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/package.html openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/xsom/visitor/package.html
@@ -415970,7 +415970,7 @@
 +<html><body>
 +Visitor pattern support for the <code>com.sun.xml.internal.xsom</code> interfaces.
 +</body></html>
-diff --git a/drop_included/jaxws_src/src/javax/annotation/Generated.java b/drop_included/jaxws_src/src/javax/annotation/Generated.java
+diff --git a/drop_included/jaxws_src/src/javax/annotation/Generated.java openjdk/jaxws/drop_included/jaxws_src/src/javax/annotation/Generated.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/annotation/Generated.java
@@ -416045,7 +416045,7 @@
 +    */
 +   String comments() default "";
 +}
-diff --git a/drop_included/jaxws_src/src/javax/annotation/PostConstruct.java b/drop_included/jaxws_src/src/javax/annotation/PostConstruct.java
+diff --git a/drop_included/jaxws_src/src/javax/annotation/PostConstruct.java openjdk/jaxws/drop_included/jaxws_src/src/javax/annotation/PostConstruct.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/annotation/PostConstruct.java
@@ -416112,7 +416112,7 @@
 +@Target(METHOD)
 +public @interface PostConstruct {
 +}
-diff --git a/drop_included/jaxws_src/src/javax/annotation/PreDestroy.java b/drop_included/jaxws_src/src/javax/annotation/PreDestroy.java
+diff --git a/drop_included/jaxws_src/src/javax/annotation/PreDestroy.java openjdk/jaxws/drop_included/jaxws_src/src/javax/annotation/PreDestroy.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/annotation/PreDestroy.java
@@ -416179,7 +416179,7 @@
 +@Target(METHOD)
 +public @interface PreDestroy {
 +}
-diff --git a/drop_included/jaxws_src/src/javax/annotation/Resource.java b/drop_included/jaxws_src/src/javax/annotation/Resource.java
+diff --git a/drop_included/jaxws_src/src/javax/annotation/Resource.java openjdk/jaxws/drop_included/jaxws_src/src/javax/annotation/Resource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/annotation/Resource.java
@@ -416307,7 +416307,7 @@
 +     */
 +    String description() default "";
 +}
-diff --git a/drop_included/jaxws_src/src/javax/annotation/Resources.java b/drop_included/jaxws_src/src/javax/annotation/Resources.java
+diff --git a/drop_included/jaxws_src/src/javax/annotation/Resources.java openjdk/jaxws/drop_included/jaxws_src/src/javax/annotation/Resources.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/annotation/Resources.java
@@ -416358,7 +416358,7 @@
 +    */
 +   Resource[] value();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/jws/HandlerChain.java b/drop_included/jaxws_src/src/javax/jws/HandlerChain.java
+diff --git a/drop_included/jaxws_src/src/javax/jws/HandlerChain.java openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/HandlerChain.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/HandlerChain.java
@@ -416430,7 +416430,7 @@
 +     */
 +    @Deprecated String name() default "";
 +};
-diff --git a/drop_included/jaxws_src/src/javax/jws/Oneway.java b/drop_included/jaxws_src/src/javax/jws/Oneway.java
+diff --git a/drop_included/jaxws_src/src/javax/jws/Oneway.java openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/Oneway.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/Oneway.java
@@ -416482,7 +416482,7 @@
 +@Target(value = {ElementType.METHOD})
 +public @interface Oneway {
 +}
-diff --git a/drop_included/jaxws_src/src/javax/jws/WebMethod.java b/drop_included/jaxws_src/src/javax/jws/WebMethod.java
+diff --git a/drop_included/jaxws_src/src/javax/jws/WebMethod.java openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/WebMethod.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/WebMethod.java
@@ -416561,7 +416561,7 @@
 +     */
 +    boolean exclude() default false;
 +};
-diff --git a/drop_included/jaxws_src/src/javax/jws/WebParam.java b/drop_included/jaxws_src/src/javax/jws/WebParam.java
+diff --git a/drop_included/jaxws_src/src/javax/jws/WebParam.java openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/WebParam.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/WebParam.java
@@ -416679,7 +416679,7 @@
 +     */
 +    boolean header() default false;
 +};
-diff --git a/drop_included/jaxws_src/src/javax/jws/WebResult.java b/drop_included/jaxws_src/src/javax/jws/WebResult.java
+diff --git a/drop_included/jaxws_src/src/javax/jws/WebResult.java openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/WebResult.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/WebResult.java
@@ -416776,7 +416776,7 @@
 +     */
 +    boolean header() default false;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/jws/WebService.java b/drop_included/jaxws_src/src/javax/jws/WebService.java
+diff --git a/drop_included/jaxws_src/src/javax/jws/WebService.java openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/WebService.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/WebService.java
@@ -416904,7 +416904,7 @@
 +     */
 +    String endpointInterface() default "";
 +};
-diff --git a/drop_included/jaxws_src/src/javax/jws/soap/InitParam.java b/drop_included/jaxws_src/src/javax/jws/soap/InitParam.java
+diff --git a/drop_included/jaxws_src/src/javax/jws/soap/InitParam.java openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/soap/InitParam.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/soap/InitParam.java
@@ -416958,7 +416958,7 @@
 +     */
 +    String value();
 +};
-diff --git a/drop_included/jaxws_src/src/javax/jws/soap/SOAPBinding.java b/drop_included/jaxws_src/src/javax/jws/soap/SOAPBinding.java
+diff --git a/drop_included/jaxws_src/src/javax/jws/soap/SOAPBinding.java openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/soap/SOAPBinding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/soap/SOAPBinding.java
@@ -417048,7 +417048,7 @@
 +     */
 +    ParameterStyle parameterStyle() default ParameterStyle.WRAPPED;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/jws/soap/SOAPMessageHandler.java b/drop_included/jaxws_src/src/javax/jws/soap/SOAPMessageHandler.java
+diff --git a/drop_included/jaxws_src/src/javax/jws/soap/SOAPMessageHandler.java openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/soap/SOAPMessageHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/soap/SOAPMessageHandler.java
@@ -417119,7 +417119,7 @@
 +     */
 +    String[] headers() default {};
 +};
-diff --git a/drop_included/jaxws_src/src/javax/jws/soap/SOAPMessageHandlers.java b/drop_included/jaxws_src/src/javax/jws/soap/SOAPMessageHandlers.java
+diff --git a/drop_included/jaxws_src/src/javax/jws/soap/SOAPMessageHandlers.java openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/soap/SOAPMessageHandlers.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/jws/soap/SOAPMessageHandlers.java
@@ -417176,7 +417176,7 @@
 +
 +    SOAPMessageHandler[] value();
 +};
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/Binder.java b/drop_included/jaxws_src/src/javax/xml/bind/Binder.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/Binder.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/Binder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/Binder.java
@@ -417602,7 +417602,7 @@
 +    abstract public Object getProperty( String name ) throws PropertyException;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/ContextFinder.java b/drop_included/jaxws_src/src/javax/xml/bind/ContextFinder.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/ContextFinder.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/ContextFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/ContextFinder.java
@@ -418119,7 +418119,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/DataBindingException.java b/drop_included/jaxws_src/src/javax/xml/bind/DataBindingException.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/DataBindingException.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/DataBindingException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/DataBindingException.java
@@ -418170,7 +418170,7 @@
 +        super(cause);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverter.java b/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverter.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverter.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverter.java
@@ -418819,7 +418819,7 @@
 +        return theConverter.printAnySimpleType( val );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverterImpl.java b/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverterImpl.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverterImpl.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverterImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverterImpl.java
@@ -419739,7 +419739,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverterInterface.java b/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverterInterface.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverterInterface.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverterInterface.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/DatatypeConverterInterface.java
@@ -420268,7 +420268,7 @@
 +     */
 +    public String printAnySimpleType( String val );
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/Element.java b/drop_included/jaxws_src/src/javax/xml/bind/Element.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/Element.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/Element.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/Element.java
@@ -420316,7 +420316,7 @@
 +
 +public interface Element {
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/GetPropertyAction.java b/drop_included/jaxws_src/src/javax/xml/bind/GetPropertyAction.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/GetPropertyAction.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/GetPropertyAction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/GetPropertyAction.java
@@ -420364,7 +420364,7 @@
 +        return System.getProperty(propertyName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/JAXB.java b/drop_included/jaxws_src/src/javax/xml/bind/JAXB.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/JAXB.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/JAXB.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/JAXB.java
@@ -420997,7 +420997,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/JAXBContext.java b/drop_included/jaxws_src/src/javax/xml/bind/JAXBContext.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/JAXBContext.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/JAXBContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/JAXBContext.java
@@ -421709,7 +421709,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/JAXBElement.java b/drop_included/jaxws_src/src/javax/xml/bind/JAXBElement.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/JAXBElement.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/JAXBElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/JAXBElement.java
@@ -421932,7 +421932,7 @@
 +
 +    private static final long serialVersionUID = 1L;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/JAXBException.java b/drop_included/jaxws_src/src/javax/xml/bind/JAXBException.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/JAXBException.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/JAXBException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/JAXBException.java
@@ -422122,7 +422122,7 @@
 +        return linkedException;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/JAXBIntrospector.java b/drop_included/jaxws_src/src/javax/xml/bind/JAXBIntrospector.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/JAXBIntrospector.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/JAXBIntrospector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/JAXBIntrospector.java
@@ -422219,7 +422219,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/MarshalException.java b/drop_included/jaxws_src/src/javax/xml/bind/MarshalException.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/MarshalException.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/MarshalException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/MarshalException.java
@@ -422324,7 +422324,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/Marshaller.java b/drop_included/jaxws_src/src/javax/xml/bind/Marshaller.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/Marshaller.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/Marshaller.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/Marshaller.java
@@ -423153,7 +423153,7 @@
 +     */
 +    public Listener getListener();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/Messages.java b/drop_included/jaxws_src/src/javax/xml/bind/Messages.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/Messages.java
@@ -423249,7 +423249,7 @@
 +    static final String ILLEGAL_CAST = // 2 args
 +        "JAXBContext.IllegalCast";
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/Messages.properties b/drop_included/jaxws_src/src/javax/xml/bind/Messages.properties
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/Messages.properties
@@ -423305,7 +423305,7 @@
 +
 +JAXBContext.IllegalCast = \
 +    ClassCastException: attempting to cast {0} to {1}.  Please make sure that you are specifying the proper ClassLoader.
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/NotIdentifiableEvent.java b/drop_included/jaxws_src/src/javax/xml/bind/NotIdentifiableEvent.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/NotIdentifiableEvent.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/NotIdentifiableEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/NotIdentifiableEvent.java
@@ -423350,7 +423350,7 @@
 +public interface NotIdentifiableEvent extends ValidationEvent {
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/ParseConversionEvent.java b/drop_included/jaxws_src/src/javax/xml/bind/ParseConversionEvent.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/ParseConversionEvent.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/ParseConversionEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/ParseConversionEvent.java
@@ -423396,7 +423396,7 @@
 +public interface ParseConversionEvent extends ValidationEvent {
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/PrintConversionEvent.java b/drop_included/jaxws_src/src/javax/xml/bind/PrintConversionEvent.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/PrintConversionEvent.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/PrintConversionEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/PrintConversionEvent.java
@@ -423442,7 +423442,7 @@
 +public interface PrintConversionEvent extends ValidationEvent {
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/PropertyException.java b/drop_included/jaxws_src/src/javax/xml/bind/PropertyException.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/PropertyException.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/PropertyException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/PropertyException.java
@@ -423561,7 +423561,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/SchemaOutputResolver.java b/drop_included/jaxws_src/src/javax/xml/bind/SchemaOutputResolver.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/SchemaOutputResolver.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/SchemaOutputResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/SchemaOutputResolver.java
@@ -423647,7 +423647,7 @@
 +     */
 +    public abstract Result createOutput( String namespaceUri, String suggestedFileName ) throws IOException;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/TypeConstraintException.java b/drop_included/jaxws_src/src/javax/xml/bind/TypeConstraintException.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/TypeConstraintException.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/TypeConstraintException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/TypeConstraintException.java
@@ -423836,7 +423836,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/UnmarshalException.java b/drop_included/jaxws_src/src/javax/xml/bind/UnmarshalException.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/UnmarshalException.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/UnmarshalException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/UnmarshalException.java
@@ -423943,7 +423943,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/Unmarshaller.java b/drop_included/jaxws_src/src/javax/xml/bind/Unmarshaller.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/Unmarshaller.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/Unmarshaller.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/Unmarshaller.java
@@ -425092,7 +425092,7 @@
 +     */
 +    public Listener getListener();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/UnmarshallerHandler.java b/drop_included/jaxws_src/src/javax/xml/bind/UnmarshallerHandler.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/UnmarshallerHandler.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/UnmarshallerHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/UnmarshallerHandler.java
@@ -425180,7 +425180,7 @@
 +     */
 +    Object getResult() throws JAXBException, IllegalStateException;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/ValidationEvent.java b/drop_included/jaxws_src/src/javax/xml/bind/ValidationEvent.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/ValidationEvent.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/ValidationEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/ValidationEvent.java
@@ -425278,7 +425278,7 @@
 +    public ValidationEventLocator getLocator();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/ValidationEventHandler.java b/drop_included/jaxws_src/src/javax/xml/bind/ValidationEventHandler.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/ValidationEventHandler.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/ValidationEventHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/ValidationEventHandler.java
@@ -425378,7 +425378,7 @@
 +    public boolean handleEvent( ValidationEvent event );
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/ValidationEventLocator.java b/drop_included/jaxws_src/src/javax/xml/bind/ValidationEventLocator.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/ValidationEventLocator.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/ValidationEventLocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/ValidationEventLocator.java
@@ -425474,7 +425474,7 @@
 +    public org.w3c.dom.Node getNode();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/ValidationException.java b/drop_included/jaxws_src/src/javax/xml/bind/ValidationException.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/ValidationException.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/ValidationException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/ValidationException.java
@@ -425579,7 +425579,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/Validator.java b/drop_included/jaxws_src/src/javax/xml/bind/Validator.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/Validator.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/Validator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/Validator.java
@@ -425870,7 +425870,7 @@
 +    public Object getProperty( String name ) throws PropertyException;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/WhiteSpaceProcessor.java b/drop_included/jaxws_src/src/javax/xml/bind/WhiteSpaceProcessor.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/WhiteSpaceProcessor.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/WhiteSpaceProcessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/WhiteSpaceProcessor.java
@@ -426072,7 +426072,7 @@
 +        return ch == 0x9 || ch == 0xA || ch == 0xD;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/DomHandler.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/DomHandler.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/DomHandler.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/DomHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/DomHandler.java
@@ -426196,7 +426196,7 @@
 +     */
 +    Source marshal( ElementT n, ValidationEventHandler errorHandler );
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/W3CDomHandler.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/W3CDomHandler.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/W3CDomHandler.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/W3CDomHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/W3CDomHandler.java
@@ -426310,7 +426310,7 @@
 +        return new DOMSource(element);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessOrder.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessOrder.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessOrder.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessOrder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessOrder.java
@@ -426364,7 +426364,7 @@
 +     */
 +    ALPHABETICAL
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessType.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessType.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessType.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessType.java
@@ -426440,7 +426440,7 @@
 +     */
 +    NONE
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessorOrder.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessorOrder.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessorOrder.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessorOrder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessorOrder.java
@@ -426526,7 +426526,7 @@
 +public @interface XmlAccessorOrder {
 +        XmlAccessOrder value() default XmlAccessOrder.UNDEFINED;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessorType.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessorType.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessorType.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessorType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAccessorType.java
@@ -426632,7 +426632,7 @@
 +     */
 +    XmlAccessType value() default XmlAccessType.PUBLIC_MEMBER;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAnyAttribute.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAnyAttribute.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAnyAttribute.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAnyAttribute.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAnyAttribute.java
@@ -426711,7 +426711,7 @@
 +@Target({FIELD,METHOD})
 +public @interface XmlAnyAttribute {
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAnyElement.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAnyElement.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAnyElement.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAnyElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAnyElement.java
@@ -427006,7 +427006,7 @@
 +     */
 +    Class<? extends DomHandler> value() default W3CDomHandler.class;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAttachmentRef.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAttachmentRef.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAttachmentRef.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAttachmentRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAttachmentRef.java
@@ -427086,7 +427086,7 @@
 +@Target({FIELD,METHOD,PARAMETER})
 +public @interface XmlAttachmentRef {
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAttribute.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAttribute.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAttribute.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAttribute.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlAttribute.java
@@ -427244,7 +427244,7 @@
 +     */
 +    String namespace() default "##default" ;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElement.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElement.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElement.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElement.java
@@ -427459,7 +427459,7 @@
 +     */
 +    static final class DEFAULT {}
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementDecl.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementDecl.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementDecl.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementDecl.java
@@ -427680,7 +427680,7 @@
 +     */
 +    public final class GLOBAL {}
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementRef.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementRef.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementRef.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementRef.java
@@ -427953,7 +427953,7 @@
 +     */
 +    static final class DEFAULT {}
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementRefs.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementRefs.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementRefs.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementRefs.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementRefs.java
@@ -428017,7 +428017,7 @@
 +public @interface XmlElementRefs {
 +    XmlElementRef[] value();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementWrapper.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementWrapper.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementWrapper.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElementWrapper.java
@@ -428166,7 +428166,7 @@
 +     */
 +    boolean required() default false;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElements.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElements.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElements.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElements.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlElements.java
@@ -428348,7 +428348,7 @@
 +     */
 +    XmlElement[] value();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlEnum.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlEnum.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlEnum.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlEnum.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlEnum.java
@@ -428428,7 +428428,7 @@
 +     */
 +    Class<?> value() default String.class;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlEnumValue.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlEnumValue.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlEnumValue.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlEnumValue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlEnumValue.java
@@ -428556,7 +428556,7 @@
 +public @interface XmlEnumValue {
 +    String value();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlID.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlID.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlID.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlID.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlID.java
@@ -428656,7 +428656,7 @@
 +
 +@Retention(RUNTIME) @Target({FIELD, METHOD})
 +public @interface XmlID { }
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlIDREF.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlIDREF.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlIDREF.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlIDREF.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlIDREF.java
@@ -428912,7 +428912,7 @@
 +
 +@Retention(RUNTIME) @Target({FIELD, METHOD})
 +public @interface XmlIDREF {}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlInlineBinaryData.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlInlineBinaryData.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlInlineBinaryData.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlInlineBinaryData.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlInlineBinaryData.java
@@ -428977,7 +428977,7 @@
 +@Target({FIELD,METHOD,TYPE})
 +public @interface XmlInlineBinaryData {
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlList.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlList.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlList.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlList.java
@@ -429092,7 +429092,7 @@
 +@Retention(RUNTIME) @Target({FIELD,METHOD,PARAMETER})
 +public @interface XmlList {
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlMimeType.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlMimeType.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlMimeType.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlMimeType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlMimeType.java
@@ -429158,7 +429158,7 @@
 +     */
 +    String value();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlMixed.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlMixed.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlMixed.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlMixed.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlMixed.java
@@ -429295,7 +429295,7 @@
 +@Target({FIELD,METHOD})
 +public @interface XmlMixed {
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlNs.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlNs.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlNs.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlNs.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlNs.java
@@ -429360,7 +429360,7 @@
 +     */
 +    String namespaceURI();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlNsForm.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlNsForm.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlNsForm.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlNsForm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlNsForm.java
@@ -429432,7 +429432,7 @@
 + * @version $Revision: 1.2 $
 + */
 +public enum XmlNsForm {UNQUALIFIED, QUALIFIED, UNSET}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlRegistry.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlRegistry.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlRegistry.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlRegistry.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlRegistry.java
@@ -429480,7 +429480,7 @@
 +@Target({TYPE})
 +public @interface XmlRegistry {
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlRootElement.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlRootElement.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlRootElement.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlRootElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlRootElement.java
@@ -429667,7 +429667,7 @@
 +    String name() default "##default";
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchema.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchema.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchema.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchema.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchema.java
@@ -429879,7 +429879,7 @@
 +    // sequence in xs:anyURI.
 +    static final String NO_LOCATION = "##generate";
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchemaType.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchemaType.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchemaType.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchemaType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchemaType.java
@@ -429991,7 +429991,7 @@
 +    static final class DEFAULT {}
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchemaTypes.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchemaTypes.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchemaTypes.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchemaTypes.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSchemaTypes.java
@@ -430057,7 +430057,7 @@
 +     */
 +    XmlSchemaType[] value();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSeeAlso.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSeeAlso.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSeeAlso.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSeeAlso.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlSeeAlso.java
@@ -430141,7 +430141,7 @@
 +public @interface XmlSeeAlso {
 +    Class[] value();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlTransient.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlTransient.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlTransient.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlTransient.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlTransient.java
@@ -430242,7 +430242,7 @@
 +
 +@Retention(RUNTIME) @Target({FIELD, METHOD, TYPE})
 +public @interface XmlTransient {}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlType.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlType.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlType.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlType.java
@@ -430700,7 +430700,7 @@
 +     */
 +    String factoryMethod() default "";
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlValue.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlValue.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlValue.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlValue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/XmlValue.java
@@ -430837,7 +430837,7 @@
 +
 +@Retention(RUNTIME) @Target({FIELD, METHOD})
 +public @interface XmlValue {}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java
@@ -430961,7 +430961,7 @@
 +        return ch == 0x9 || ch == 0xA || ch == 0xD || ch == 0x20;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java
@@ -431015,7 +431015,7 @@
 +        return DatatypeConverter.printHexBinary(bytes);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java
@@ -431112,7 +431112,7 @@
 +        return ch == 0x9 || ch == 0xA || ch == 0xD;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlAdapter.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlAdapter.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlAdapter.java
@@ -431310,7 +431310,7 @@
 +     */
 +    public abstract ValueType marshal(BoundType v) throws Exception;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
@@ -431432,7 +431432,7 @@
 +    static final class DEFAULT {}
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java b/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
@@ -431499,7 +431499,7 @@
 +     */
 +    XmlJavaTypeAdapter[] value();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/package.html b/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/package.html
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/package.html openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/adapters/package.html
@@ -431559,7 +431559,7 @@
 +
 +    </body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/package.html b/drop_included/jaxws_src/src/javax/xml/bind/annotation/package.html
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/annotation/package.html openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/annotation/package.html
@@ -431846,7 +431846,7 @@
 +        @since JAXB 2.0
 +    </body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/attachment/AttachmentMarshaller.java b/drop_included/jaxws_src/src/javax/xml/bind/attachment/AttachmentMarshaller.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/attachment/AttachmentMarshaller.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/attachment/AttachmentMarshaller.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/attachment/AttachmentMarshaller.java
@@ -432050,7 +432050,7 @@
 +    */
 +    public abstract String addSwaRefAttachment(DataHandler data);
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/attachment/AttachmentUnmarshaller.java b/drop_included/jaxws_src/src/javax/xml/bind/attachment/AttachmentUnmarshaller.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/attachment/AttachmentUnmarshaller.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/attachment/AttachmentUnmarshaller.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/attachment/AttachmentUnmarshaller.java
@@ -432194,7 +432194,7 @@
 +     */
 +    public boolean isXOPPackage() { return false; }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/attachment/package.html b/drop_included/jaxws_src/src/javax/xml/bind/attachment/package.html
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/attachment/package.html openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/attachment/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/attachment/package.html
@@ -432263,7 +432263,7 @@
 +        @since JAXB 2.0
 +    </body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/AbstractMarshallerImpl.java b/drop_included/jaxws_src/src/javax/xml/bind/helpers/AbstractMarshallerImpl.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/AbstractMarshallerImpl.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/AbstractMarshallerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/AbstractMarshallerImpl.java
@@ -432763,7 +432763,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java b/drop_included/jaxws_src/src/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
@@ -433203,7 +433203,7 @@
 +        throw new UnsupportedOperationException();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/DefaultValidationEventHandler.java b/drop_included/jaxws_src/src/javax/xml/bind/helpers/DefaultValidationEventHandler.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/DefaultValidationEventHandler.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/DefaultValidationEventHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/DefaultValidationEventHandler.java
@@ -433339,7 +433339,7 @@
 +        return msg.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/Messages.java b/drop_included/jaxws_src/src/javax/xml/bind/helpers/Messages.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/Messages.java
@@ -433441,7 +433441,7 @@
 +    static final String MUST_NOT_BE_NULL = // 1 arg
 +        "Shared.MustNotBeNull";
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/Messages.properties b/drop_included/jaxws_src/src/javax/xml/bind/helpers/Messages.properties
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/Messages.properties
@@ -433505,7 +433505,7 @@
 +
 +Shared.MustNotBeNull = \
 +        {0} parameter must not be null
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/NotIdentifiableEventImpl.java b/drop_included/jaxws_src/src/javax/xml/bind/helpers/NotIdentifiableEventImpl.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/NotIdentifiableEventImpl.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/NotIdentifiableEventImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/NotIdentifiableEventImpl.java
@@ -433596,7 +433596,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/ParseConversionEventImpl.java b/drop_included/jaxws_src/src/javax/xml/bind/helpers/ParseConversionEventImpl.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/ParseConversionEventImpl.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/ParseConversionEventImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/ParseConversionEventImpl.java
@@ -433688,7 +433688,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/PrintConversionEventImpl.java b/drop_included/jaxws_src/src/javax/xml/bind/helpers/PrintConversionEventImpl.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/PrintConversionEventImpl.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/PrintConversionEventImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/PrintConversionEventImpl.java
@@ -433780,7 +433780,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/ValidationEventImpl.java b/drop_included/jaxws_src/src/javax/xml/bind/helpers/ValidationEventImpl.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/ValidationEventImpl.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/ValidationEventImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/ValidationEventImpl.java
@@ -433960,7 +433960,7 @@
 +            });
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/ValidationEventLocatorImpl.java b/drop_included/jaxws_src/src/javax/xml/bind/helpers/ValidationEventLocatorImpl.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/ValidationEventLocatorImpl.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/ValidationEventLocatorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/ValidationEventLocatorImpl.java
@@ -434238,7 +434238,7 @@
 +            String.valueOf(getOffset()));
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/package.html b/drop_included/jaxws_src/src/javax/xml/bind/helpers/package.html
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/helpers/package.html openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/helpers/package.html
@@ -434303,7 +434303,7 @@
 +
 +    </body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/package.html b/drop_included/jaxws_src/src/javax/xml/bind/package.html
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/package.html openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/package.html
@@ -434369,7 +434369,7 @@
 +
 +    </body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/util/JAXBResult.java b/drop_included/jaxws_src/src/javax/xml/bind/util/JAXBResult.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/util/JAXBResult.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/util/JAXBResult.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/util/JAXBResult.java
@@ -434523,7 +434523,7 @@
 +        throw new JAXBException( Messages.format( Messages.RESULT_NULL_CONTEXT ) );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/util/JAXBSource.java b/drop_included/jaxws_src/src/javax/xml/bind/util/JAXBSource.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/util/JAXBSource.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/util/JAXBSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/util/JAXBSource.java
@@ -434798,7 +434798,7 @@
 +        throw new JAXBException( message );
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/util/Messages.java b/drop_included/jaxws_src/src/javax/xml/bind/util/Messages.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/util/Messages.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/util/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/util/Messages.java
@@ -434886,7 +434886,7 @@
 +        "JAXBSource.NullMarshaller";
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/util/Messages.properties b/drop_included/jaxws_src/src/javax/xml/bind/util/Messages.properties
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/util/Messages.properties openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/util/Messages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/util/Messages.properties
@@ -434933,7 +434933,7 @@
 +
 +JAXBSource.NullMarshaller = \
 +        Marshaller can not be null
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/util/ValidationEventCollector.java b/drop_included/jaxws_src/src/javax/xml/bind/util/ValidationEventCollector.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/util/ValidationEventCollector.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/util/ValidationEventCollector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/util/ValidationEventCollector.java
@@ -435051,7 +435051,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/bind/util/package.html b/drop_included/jaxws_src/src/javax/xml/bind/util/package.html
+diff --git a/drop_included/jaxws_src/src/javax/xml/bind/util/package.html openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/util/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/bind/util/package.html
@@ -435111,7 +435111,7 @@
 +
 +    </body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/AttachmentPart.java b/drop_included/jaxws_src/src/javax/xml/soap/AttachmentPart.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/AttachmentPart.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/AttachmentPart.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/AttachmentPart.java
@@ -435648,7 +435648,7 @@
 +     */
 +    public abstract Iterator getNonMatchingMimeHeaders(String[] names);
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/Detail.java b/drop_included/jaxws_src/src/javax/xml/soap/Detail.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/Detail.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/Detail.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/Detail.java
@@ -435758,7 +435758,7 @@
 +     */
 +    public Iterator getDetailEntries();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/DetailEntry.java b/drop_included/jaxws_src/src/javax/xml/soap/DetailEntry.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/DetailEntry.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/DetailEntry.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/DetailEntry.java
@@ -435805,7 +435805,7 @@
 +public interface DetailEntry extends SOAPElement {
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/FactoryFinder.java b/drop_included/jaxws_src/src/javax/xml/soap/FactoryFinder.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/FactoryFinder.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/FactoryFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/FactoryFinder.java
@@ -435998,7 +435998,7 @@
 +        return newInstance(fallbackClassName, classLoader);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/MessageFactory.java b/drop_included/jaxws_src/src/javax/xml/soap/MessageFactory.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/MessageFactory.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/MessageFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/MessageFactory.java
@@ -436205,7 +436205,7 @@
 +                                              InputStream in)
 +        throws IOException, SOAPException;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/MimeHeader.java b/drop_included/jaxws_src/src/javax/xml/soap/MimeHeader.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/MimeHeader.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/MimeHeader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/MimeHeader.java
@@ -436286,7 +436286,7 @@
 +        return value;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/MimeHeaders.java b/drop_included/jaxws_src/src/javax/xml/soap/MimeHeaders.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/MimeHeaders.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/MimeHeaders.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/MimeHeaders.java
@@ -436566,7 +436566,7 @@
 +        return new MatchingIterator(names, false);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/Name.java b/drop_included/jaxws_src/src/javax/xml/soap/Name.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/Name.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/Name.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/Name.java
@@ -436687,7 +436687,7 @@
 +     */
 +    String getURI();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/Node.java b/drop_included/jaxws_src/src/javax/xml/soap/Node.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/Node.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/Node.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/Node.java
@@ -436810,7 +436810,7 @@
 +    public void recycleNode();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SAAJMetaFactory.java b/drop_included/jaxws_src/src/javax/xml/soap/SAAJMetaFactory.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SAAJMetaFactory.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SAAJMetaFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SAAJMetaFactory.java
@@ -436934,7 +436934,7 @@
 +    protected abstract SOAPFactory newSOAPFactory(String protocol)
 +        throws SOAPException;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SAAJResult.java b/drop_included/jaxws_src/src/javax/xml/soap/SAAJResult.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SAAJResult.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SAAJResult.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SAAJResult.java
@@ -437077,7 +437077,7 @@
 +        return (javax.xml.soap.Node)super.getNode().getFirstChild();
 +     }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPBody.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPBody.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPBody.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPBody.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPBody.java
@@ -437385,7 +437385,7 @@
 +    public org.w3c.dom.Document extractContentAsDocument()
 +        throws SOAPException;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPBodyElement.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPBodyElement.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPBodyElement.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPBodyElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPBodyElement.java
@@ -437439,7 +437439,7 @@
 + */
 +public interface SOAPBodyElement extends SOAPElement {
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPConnection.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPConnection.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPConnection.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPConnection.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPConnection.java
@@ -437545,7 +437545,7 @@
 +    public abstract void close()
 +        throws SOAPException;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPConnectionFactory.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPConnectionFactory.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPConnectionFactory.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPConnectionFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPConnectionFactory.java
@@ -437642,7 +437642,7 @@
 +    public abstract SOAPConnection createConnection()
 +        throws SOAPException;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPConstants.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPConstants.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPConstants.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPConstants.java
@@ -437854,7 +437854,7 @@
 +         new QName(URI_NS_SOAP_1_2_ENVELOPE, "Receiver", SOAP_ENV_PREFIX);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPElement.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPElement.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPElement.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPElement.java
@@ -438389,7 +438389,7 @@
 +     */
 +    public String getEncodingStyle();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPElementFactory.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPElementFactory.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPElementFactory.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPElementFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPElementFactory.java
@@ -438538,7 +438538,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPEnvelope.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPEnvelope.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPEnvelope.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPEnvelope.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPEnvelope.java
@@ -438749,7 +438749,7 @@
 +     */
 +    public SOAPBody addBody() throws SOAPException;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPException.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPException.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPException.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPException.java
@@ -438923,7 +438923,7 @@
 +        return this;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPFactory.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPFactory.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPFactory.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPFactory.java
@@ -439227,7 +439227,7 @@
 +            return SAAJMetaFactory.getInstance().newSOAPFactory(protocol);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPFault.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPFault.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPFault.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPFault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPFault.java
@@ -439749,7 +439749,7 @@
 +    public void setFaultRole(String uri) throws SOAPException;
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPFaultElement.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPFaultElement.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPFaultElement.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPFaultElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPFaultElement.java
@@ -439797,7 +439797,7 @@
 + */
 +public interface SOAPFaultElement extends SOAPElement {
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPHeader.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPHeader.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPHeader.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPHeader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPHeader.java
@@ -440070,7 +440070,7 @@
 +    public Iterator extractAllHeaderElements();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPHeaderElement.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPHeaderElement.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPHeaderElement.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPHeaderElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPHeaderElement.java
@@ -440247,7 +440247,7 @@
 +     */
 +    public boolean getRelay();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPMessage.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPMessage.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPMessage.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPMessage.java
@@ -440714,7 +440714,7 @@
 +        throw new UnsupportedOperationException("getProperty must be overridden by all subclasses of SOAPMessage");
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPPart.java b/drop_included/jaxws_src/src/javax/xml/soap/SOAPPart.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/SOAPPart.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPPart.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/SOAPPart.java
@@ -440990,7 +440990,7 @@
 +     */
 +    public abstract Source getContent() throws SOAPException;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/Text.java b/drop_included/jaxws_src/src/javax/xml/soap/Text.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/Text.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/Text.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/Text.java
@@ -441043,7 +441043,7 @@
 +     */
 +    public boolean isComment();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/soap/package.html b/drop_included/jaxws_src/src/javax/xml/soap/package.html
+diff --git a/drop_included/jaxws_src/src/javax/xml/soap/package.html openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/soap/package.html
@@ -441139,7 +441139,7 @@
 +
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Action.java b/drop_included/jaxws_src/src/javax/xml/ws/Action.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Action.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Action.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Action.java
@@ -441221,7 +441221,7 @@
 +     */
 +    FaultAction[] fault() default { };
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/AsyncHandler.java b/drop_included/jaxws_src/src/javax/xml/ws/AsyncHandler.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/AsyncHandler.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/AsyncHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/AsyncHandler.java
@@ -441268,7 +441268,7 @@
 +    **/
 +    void handleResponse(Response<T> res);
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Binding.java b/drop_included/jaxws_src/src/javax/xml/ws/Binding.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Binding.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Binding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Binding.java
@@ -441340,7 +441340,7 @@
 +     */
 +    String getBindingID();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/BindingProvider.java b/drop_included/jaxws_src/src/javax/xml/ws/BindingProvider.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/BindingProvider.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/BindingProvider.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/BindingProvider.java
@@ -441528,7 +441528,7 @@
 +     */
 +    public <T extends EndpointReference> T getEndpointReference(Class<T> clazz);
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/BindingType.java b/drop_included/jaxws_src/src/javax/xml/ws/BindingType.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/BindingType.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/BindingType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/BindingType.java
@@ -441595,7 +441595,7 @@
 +      */
 +     String value() default "" ;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Dispatch.java b/drop_included/jaxws_src/src/javax/xml/ws/Dispatch.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Dispatch.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Dispatch.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Dispatch.java
@@ -441716,7 +441716,7 @@
 +    **/
 +    public void invokeOneWay(T msg);
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Endpoint.java b/drop_included/jaxws_src/src/javax/xml/ws/Endpoint.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Endpoint.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Endpoint.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Endpoint.java
@@ -442081,7 +442081,7 @@
 +    public abstract <T extends EndpointReference> T getEndpointReference(Class<T> clazz,
 +            Element... referenceParameters);
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/EndpointReference.java b/drop_included/jaxws_src/src/javax/xml/ws/EndpointReference.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/EndpointReference.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/EndpointReference.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/EndpointReference.java
@@ -442276,7 +442276,7 @@
 +        return w.toString();
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/FaultAction.java b/drop_included/jaxws_src/src/javax/xml/ws/FaultAction.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/FaultAction.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/FaultAction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/FaultAction.java
@@ -442344,7 +442344,7 @@
 +     */
 +    String value() default "";
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Holder.java b/drop_included/jaxws_src/src/javax/xml/ws/Holder.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Holder.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Holder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Holder.java
@@ -442403,7 +442403,7 @@
 +      this.value = value;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/LogicalMessage.java b/drop_included/jaxws_src/src/javax/xml/ws/LogicalMessage.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/LogicalMessage.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/LogicalMessage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/LogicalMessage.java
@@ -442500,7 +442500,7 @@
 +  **/
 +  public void setPayload(Object payload, JAXBContext context);
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/ProtocolException.java b/drop_included/jaxws_src/src/javax/xml/ws/ProtocolException.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/ProtocolException.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/ProtocolException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/ProtocolException.java
@@ -442593,7 +442593,7 @@
 +        super(cause);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Provider.java b/drop_included/jaxws_src/src/javax/xml/ws/Provider.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Provider.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Provider.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Provider.java
@@ -442661,7 +442661,7 @@
 +  **/
 +  public T invoke(T request);
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/RequestWrapper.java b/drop_included/jaxws_src/src/javax/xml/ws/RequestWrapper.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/RequestWrapper.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/RequestWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/RequestWrapper.java
@@ -442732,7 +442732,7 @@
 +  public String className() default "";
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/RespectBinding.java b/drop_included/jaxws_src/src/javax/xml/ws/RespectBinding.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/RespectBinding.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/RespectBinding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/RespectBinding.java
@@ -442844,7 +442844,7 @@
 +     */
 +    boolean enabled() default true;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/RespectBindingFeature.java b/drop_included/jaxws_src/src/javax/xml/ws/RespectBindingFeature.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/RespectBindingFeature.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/RespectBindingFeature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/RespectBindingFeature.java
@@ -442975,7 +442975,7 @@
 +        return ID;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Response.java b/drop_included/jaxws_src/src/javax/xml/ws/Response.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Response.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Response.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Response.java
@@ -443032,7 +443032,7 @@
 +    **/
 +    Map<String,Object> getContext();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/ResponseWrapper.java b/drop_included/jaxws_src/src/javax/xml/ws/ResponseWrapper.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/ResponseWrapper.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/ResponseWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/ResponseWrapper.java
@@ -443114,7 +443114,7 @@
 +  public String className() default "";
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Service.java b/drop_included/jaxws_src/src/javax/xml/ws/Service.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/Service.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Service.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/Service.java
@@ -443832,7 +443832,7 @@
 +        return new Service(null, serviceName);
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/ServiceMode.java b/drop_included/jaxws_src/src/javax/xml/ws/ServiceMode.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/ServiceMode.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/ServiceMode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/ServiceMode.java
@@ -443890,7 +443890,7 @@
 +  **/
 +  public Service.Mode value() default Service.Mode.PAYLOAD;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebEndpoint.java b/drop_included/jaxws_src/src/javax/xml/ws/WebEndpoint.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebEndpoint.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebEndpoint.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebEndpoint.java
@@ -443951,7 +443951,7 @@
 +  **/
 +  String name() default "";
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebFault.java b/drop_included/jaxws_src/src/javax/xml/ws/WebFault.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebFault.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebFault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebFault.java
@@ -444015,7 +444015,7 @@
 +  **/
 +  public String faultBean() default "";
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServiceClient.java b/drop_included/jaxws_src/src/javax/xml/ws/WebServiceClient.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServiceClient.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServiceClient.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServiceClient.java
@@ -444083,7 +444083,7 @@
 +  **/
 +  String wsdlLocation() default "";
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServiceContext.java b/drop_included/jaxws_src/src/javax/xml/ws/WebServiceContext.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServiceContext.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServiceContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServiceContext.java
@@ -444239,7 +444239,7 @@
 +    public <T extends EndpointReference> T getEndpointReference(Class<T> clazz,
 +            Element... referenceParameters);
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServiceException.java b/drop_included/jaxws_src/src/javax/xml/ws/WebServiceException.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServiceException.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServiceException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServiceException.java
@@ -444323,7 +444323,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServiceFeature.java b/drop_included/jaxws_src/src/javax/xml/ws/WebServiceFeature.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServiceFeature.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServiceFeature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServiceFeature.java
@@ -444409,7 +444409,7 @@
 +       return enabled;
 +   }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServicePermission.java b/drop_included/jaxws_src/src/javax/xml/ws/WebServicePermission.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServicePermission.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServicePermission.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServicePermission.java
@@ -444493,7 +444493,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServiceProvider.java b/drop_included/jaxws_src/src/javax/xml/ws/WebServiceProvider.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServiceProvider.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServiceProvider.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServiceProvider.java
@@ -444561,7 +444561,7 @@
 +     */
 +    String portName() default "";
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServiceRef.java b/drop_included/jaxws_src/src/javax/xml/ws/WebServiceRef.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServiceRef.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServiceRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServiceRef.java
@@ -444665,7 +444665,7 @@
 +      */
 +     String wsdlLocation() default "";
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServiceRefs.java b/drop_included/jaxws_src/src/javax/xml/ws/WebServiceRefs.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/WebServiceRefs.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServiceRefs.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/WebServiceRefs.java
@@ -444721,7 +444721,7 @@
 +    */
 +   WebServiceRef[] value();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/Handler.java b/drop_included/jaxws_src/src/javax/xml/ws/handler/Handler.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/Handler.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/Handler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/Handler.java
@@ -444813,7 +444813,7 @@
 +  **/
 +  public void close(MessageContext context);
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/HandlerResolver.java b/drop_included/jaxws_src/src/javax/xml/ws/handler/HandlerResolver.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/HandlerResolver.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/HandlerResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/HandlerResolver.java
@@ -444871,7 +444871,7 @@
 +  **/
 +  public java.util.List<Handler> getHandlerChain(PortInfo portInfo);
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/LogicalHandler.java b/drop_included/jaxws_src/src/javax/xml/ws/handler/LogicalHandler.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/LogicalHandler.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/LogicalHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/LogicalHandler.java
@@ -444910,7 +444910,7 @@
 +**/
 +public interface LogicalHandler<C extends LogicalMessageContext> extends Handler<C> {
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/LogicalMessageContext.java b/drop_included/jaxws_src/src/javax/xml/ws/handler/LogicalMessageContext.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/LogicalMessageContext.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/LogicalMessageContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/LogicalMessageContext.java
@@ -444961,7 +444961,7 @@
 +  **/
 +  public LogicalMessage getMessage();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/MessageContext.java b/drop_included/jaxws_src/src/javax/xml/ws/handler/MessageContext.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/MessageContext.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/MessageContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/MessageContext.java
@@ -445171,7 +445171,7 @@
 +     */
 +    public Scope getScope(String  name);
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/PortInfo.java b/drop_included/jaxws_src/src/javax/xml/ws/handler/PortInfo.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/PortInfo.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/PortInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/PortInfo.java
@@ -445242,7 +445242,7 @@
 +  public String getBindingID();
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/package.html b/drop_included/jaxws_src/src/javax/xml/ws/handler/package.html
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/package.html openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/package.html
@@ -445276,7 +445276,7 @@
 +This package defines APIs for message handlers.
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/SOAPHandler.java b/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/SOAPHandler.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/SOAPHandler.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/SOAPHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/SOAPHandler.java
@@ -445330,7 +445330,7 @@
 +  **/
 +  Set<QName> getHeaders();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/SOAPMessageContext.java b/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/SOAPMessageContext.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/SOAPMessageContext.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/SOAPMessageContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/SOAPMessageContext.java
@@ -445434,7 +445434,7 @@
 +  **/
 +  public Set<String> getRoles();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/package.html b/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/package.html
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/package.html openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/handler/soap/package.html
@@ -445468,7 +445468,7 @@
 +This package defines APIs for SOAP message handlers.
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/http/HTTPBinding.java b/drop_included/jaxws_src/src/javax/xml/ws/http/HTTPBinding.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/http/HTTPBinding.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/http/HTTPBinding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/http/HTTPBinding.java
@@ -445515,7 +445515,7 @@
 +   */
 +  public static final String HTTP_BINDING = "http://www.w3.org/2004/08/wsdl/http";
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/http/HTTPException.java b/drop_included/jaxws_src/src/javax/xml/ws/http/HTTPException.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/http/HTTPException.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/http/HTTPException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/http/HTTPException.java
@@ -445576,7 +445576,7 @@
 +    return statusCode;
 +  }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/http/package.html b/drop_included/jaxws_src/src/javax/xml/ws/http/package.html
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/http/package.html openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/http/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/http/package.html
@@ -445610,7 +445610,7 @@
 +This package defines APIs specific to the HTTP binding.
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/package.html b/drop_included/jaxws_src/src/javax/xml/ws/package.html
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/package.html openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/package.html
@@ -445644,7 +445644,7 @@
 +This package contains the core JAX-WS APIs.
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/soap/Addressing.java b/drop_included/jaxws_src/src/javax/xml/ws/soap/Addressing.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/soap/Addressing.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/soap/Addressing.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/soap/Addressing.java
@@ -445757,7 +445757,7 @@
 +     */
 +    boolean required() default false;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/soap/AddressingFeature.java b/drop_included/jaxws_src/src/javax/xml/ws/soap/AddressingFeature.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/soap/AddressingFeature.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/soap/AddressingFeature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/soap/AddressingFeature.java
@@ -445924,7 +445924,7 @@
 +        return required;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/soap/MTOM.java b/drop_included/jaxws_src/src/javax/xml/ws/soap/MTOM.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/soap/MTOM.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/soap/MTOM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/soap/MTOM.java
@@ -445998,7 +445998,7 @@
 +     */
 +    int threshold() default 0;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/soap/MTOMFeature.java b/drop_included/jaxws_src/src/javax/xml/ws/soap/MTOMFeature.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/soap/MTOMFeature.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/soap/MTOMFeature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/soap/MTOMFeature.java
@@ -446137,7 +446137,7 @@
 +        return threshold;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/soap/SOAPBinding.java b/drop_included/jaxws_src/src/javax/xml/ws/soap/SOAPBinding.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/soap/SOAPBinding.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/soap/SOAPBinding.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/soap/SOAPBinding.java
@@ -446252,7 +446252,7 @@
 +  **/
 +  public MessageFactory getMessageFactory();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/soap/SOAPFaultException.java b/drop_included/jaxws_src/src/javax/xml/ws/soap/SOAPFaultException.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/soap/SOAPFaultException.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/soap/SOAPFaultException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/soap/SOAPFaultException.java
@@ -446332,7 +446332,7 @@
 +        return this.fault;
 +    }
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/soap/package.html b/drop_included/jaxws_src/src/javax/xml/ws/soap/package.html
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/soap/package.html openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/soap/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/soap/package.html
@@ -446366,7 +446366,7 @@
 +This package defines APIs specific to the SOAP binding.
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/spi/FactoryFinder.java b/drop_included/jaxws_src/src/javax/xml/ws/spi/FactoryFinder.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/spi/FactoryFinder.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/spi/FactoryFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/spi/FactoryFinder.java
@@ -446550,7 +446550,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/spi/Provider.java b/drop_included/jaxws_src/src/javax/xml/ws/spi/Provider.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/spi/Provider.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/spi/Provider.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/spi/Provider.java
@@ -446859,7 +446859,7 @@
 +    public abstract W3CEndpointReference createW3CEndpointReference(String address, QName serviceName, QName portName,
 +            List<Element> metadata, String wsdlDocumentLocation, List<Element> referenceParameters);
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/spi/ServiceDelegate.java b/drop_included/jaxws_src/src/javax/xml/ws/spi/ServiceDelegate.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/spi/ServiceDelegate.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/spi/ServiceDelegate.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/spi/ServiceDelegate.java
@@ -447486,7 +447486,7 @@
 +    public abstract void setExecutor(java.util.concurrent.Executor executor);
 +
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/spi/WebServiceFeatureAnnotation.java b/drop_included/jaxws_src/src/javax/xml/ws/spi/WebServiceFeatureAnnotation.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/spi/WebServiceFeatureAnnotation.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/spi/WebServiceFeatureAnnotation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/spi/WebServiceFeatureAnnotation.java
@@ -447564,7 +447564,7 @@
 +     */
 +    Class<? extends WebServiceFeature> bean();
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/spi/package.html b/drop_included/jaxws_src/src/javax/xml/ws/spi/package.html
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/spi/package.html openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/spi/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/spi/package.html
@@ -447598,7 +447598,7 @@
 +This package defines SPIs for JAX-WS.
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/W3CEndpointReference.java b/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/W3CEndpointReference.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/W3CEndpointReference.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/W3CEndpointReference.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/W3CEndpointReference.java
@@ -447759,7 +447759,7 @@
 +
 +    protected static final String NS = "http://www.w3.org/2005/08/addressing";
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java b/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java
@@ -448023,7 +448023,7 @@
 +    private QName endpointName;
 +    private String wsdlDocumentLocation;
 +}
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/package-info.java b/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/package-info.java
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/package-info.java openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/package-info.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/package-info.java
@@ -448057,7 +448057,7 @@
 +@javax.xml.bind.annotation.XmlSchema(namespace=W3CEndpointReference.NS,
 +                                     location="http://www.w3.org/2006/03/addressing/ws-addr.xsd")
 +package javax.xml.ws.wsaddressing;
-diff --git a/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/package.html b/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/package.html
+diff --git a/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/package.html openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/javax/xml/ws/wsaddressing/package.html
@@ -448091,7 +448091,7 @@
 +This package defines APIs related to WS-Addressing.
 +</body>
 +</html>
-diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/Datatype.java b/drop_included/jaxws_src/src/org/relaxng/datatype/Datatype.java
+diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/Datatype.java openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/Datatype.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/Datatype.java
@@ -448357,7 +448357,7 @@
 +         */
 +        public boolean isContextDependent();
 +}
-diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeBuilder.java b/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeBuilder.java
+diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeBuilder.java
@@ -448431,7 +448431,7 @@
 +         */
 +        Datatype createDatatype() throws DatatypeException;
 +}
-diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeException.java b/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeException.java
+diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeException.java openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeException.java
@@ -448499,7 +448499,7 @@
 +                return index;
 +        }
 +}
-diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeLibrary.java b/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeLibrary.java
+diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeLibrary.java openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeLibrary.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeLibrary.java
@@ -448565,7 +448565,7 @@
 +         */
 +        Datatype createDatatype( String typeLocalName ) throws DatatypeException;
 +}
-diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeLibraryFactory.java b/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeLibraryFactory.java
+diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeLibraryFactory.java openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeLibraryFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeLibraryFactory.java
@@ -448620,7 +448620,7 @@
 +         */
 +        DatatypeLibrary createDatatypeLibrary( String namespaceURI );
 +}
-diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeStreamingValidator.java b/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeStreamingValidator.java
+diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeStreamingValidator.java openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeStreamingValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/DatatypeStreamingValidator.java
@@ -448695,7 +448695,7 @@
 +         */
 +        void checkValid() throws DatatypeException;
 +}
-diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/ValidationContext.java b/drop_included/jaxws_src/src/org/relaxng/datatype/ValidationContext.java
+diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/ValidationContext.java openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/ValidationContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/ValidationContext.java
@@ -448790,7 +448790,7 @@
 +         */
 +        boolean isNotation( String notationName );
 +}
-diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java b/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java
+diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java
@@ -449056,7 +449056,7 @@
 +        }
 +
 +}
-diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java b/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java
+diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java
@@ -449127,7 +449127,7 @@
 +                return baseType;
 +        }
 +}
-diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/StreamingValidatorImpl.java b/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
+diff --git a/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/StreamingValidatorImpl.java openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxws/drop_included/jaxws_src/src/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
--- a/patches/openjdk/jaxp144_05.patch	Wed Apr 17 11:26:25 2013 +0100
+++ b/patches/openjdk/jaxp144_05.patch	Wed Apr 17 11:44:19 2013 +0100
@@ -5,7 +5,7 @@
 # Parent  8299b980d2e10bb4e32dc29da1f0b83d22e88557
 Include contents of jaxp144_05.zip
 
-diff --git a/drop_included/jaxp_src/LICENSE b/drop_included/jaxp_src/LICENSE
+diff --git a/drop_included/jaxp_src/LICENSE openjdk/jaxp/drop_included/jaxp_src/LICENSE
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/LICENSE
@@ -357,7 +357,7 @@
 +    you modify this library, you may extend this exception to your version of
 +    the library, but you are not obligated to do so.  If you do not wish to do
 +    so, delete this exception statement from your version.
-diff --git a/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/Scanner.java b/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/Scanner.java
+diff --git a/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/Scanner.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/Scanner.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/Scanner.java
@@ -407,7 +407,7 @@
 +public interface Scanner {
 +    public Symbol next_token() throws java.lang.Exception;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/Symbol.java b/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/Symbol.java
+diff --git a/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/Symbol.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/Symbol.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/Symbol.java
@@ -541,7 +541,7 @@
 +    ****************************/
 +  public String toString() { return "#"+sym; }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/lr_parser.java b/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/lr_parser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/lr_parser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/lr_parser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/lr_parser.java
@@ -1797,7 +1797,7 @@
 +      return result;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/virtual_parse_stack.java b/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/virtual_parse_stack.java
+diff --git a/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/virtual_parse_stack.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/virtual_parse_stack.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/java_cup/internal/runtime/virtual_parse_stack.java
@@ -1971,7 +1971,7 @@
 +  /*-----------------------------------------------------------*/
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/Constants.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/Constants.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/Constants.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/Constants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/Constants.java
@@ -2764,7 +2764,7 @@
 +    "Null", "InitObject", "Object", "NewObject"
 +  };
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/ExceptionConstants.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/ExceptionConstants.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/ExceptionConstants.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/ExceptionConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/ExceptionConstants.java
@@ -2895,7 +2895,7 @@
 +  };
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/Repository.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/Repository.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/Repository.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/Repository.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/Repository.java
@@ -3150,7 +3150,7 @@
 +    return implementationOf(lookupClass(clazz), inter);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java
@@ -3329,7 +3329,7 @@
 +    return (access_flags & Constants.ACC_STRICT) != 0;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java
@@ -3639,7 +3639,7 @@
 +    return Constants.ATTRIBUTE_NAMES[tag];
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java
@@ -3744,7 +3744,7 @@
 +                                   java.io.DataInputStream file,
 +                                   ConstantPool constant_pool);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java
@@ -3820,7 +3820,7 @@
 +  public ClassFormatException() { super(); }
 +  public ClassFormatException(String s) { super(s); }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ClassParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ClassParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ClassParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ClassParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ClassParser.java
@@ -4156,7 +4156,7 @@
 +    major = file.readUnsignedShort();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Code.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Code.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Code.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Code.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Code.java
@@ -4537,7 +4537,7 @@
 +    return c;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/CodeException.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/CodeException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/CodeException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/CodeException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/CodeException.java
@@ -4774,7 +4774,7 @@
 +    return null;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Constant.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Constant.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Constant.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Constant.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Constant.java
@@ -4930,7 +4930,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java
@@ -5092,7 +5092,7 @@
 +      ", name_and_type_index = " + name_and_type_index + ")";
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java
@@ -5254,7 +5254,7 @@
 +    return super.toString() + "(name_index = " + name_index + ")";
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java
@@ -5404,7 +5404,7 @@
 +    return new Double(bytes);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java
@@ -5516,7 +5516,7 @@
 +    v.visitConstantFieldref(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java
@@ -5665,7 +5665,7 @@
 +    return new Float(bytes);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java
@@ -5821,7 +5821,7 @@
 +    return new Integer(bytes);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java
@@ -5933,7 +5933,7 @@
 +    v.visitConstantInterfaceMethodref(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java
@@ -6080,7 +6080,7 @@
 +    return new Long(bytes);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java
@@ -6192,7 +6192,7 @@
 +    v.visitConstantMethodref(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java
@@ -6371,7 +6371,7 @@
 +      ", signature_index = " + signature_index + ")";
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java
@@ -6448,7 +6448,7 @@
 +   */
 +  public abstract Object getConstantValue(ConstantPool cp);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java
@@ -6828,7 +6828,7 @@
 +    return c;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantString.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantString.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantString.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantString.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantString.java
@@ -6983,7 +6983,7 @@
 +    return (String)getConstantValue(cp);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java
@@ -7138,7 +7138,7 @@
 +    return super.toString() + "(\"" + Utility.replace(bytes, "\n", "\\n") + "\")";
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java
@@ -7324,7 +7324,7 @@
 +    return c;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Deprecated.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Deprecated.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Deprecated.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Deprecated.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Deprecated.java
@@ -7501,7 +7501,7 @@
 +    return c;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java
@@ -7866,7 +7866,7 @@
 +    stack.pop();
 + }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java
@@ -7979,7 +7979,7 @@
 +  public void visitStackMap(StackMap obj) {}
 +  public void visitStackMapEntry(StackMapEntry obj) {}
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java
@@ -8189,7 +8189,7 @@
 +    return c;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Field.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Field.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Field.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Field.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Field.java
@@ -8362,7 +8362,7 @@
 +    return Type.getReturnType(getSignature());
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java
@@ -8593,7 +8593,7 @@
 +    return c;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/InnerClass.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/InnerClass.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/InnerClass.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/InnerClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/InnerClass.java
@@ -8822,7 +8822,7 @@
 +    return null;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java
@@ -9011,7 +9011,7 @@
 +    return c;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java
@@ -9840,7 +9840,7 @@
 +    return vec.toArray();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LineNumber.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LineNumber.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LineNumber.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LineNumber.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LineNumber.java
@@ -10012,7 +10012,7 @@
 +    return null;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java
@@ -10260,7 +10260,7 @@
 +
 +  public final int getTableLength() { return line_number_table_length; }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java
@@ -10527,7 +10527,7 @@
 +    return null;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java
@@ -10731,7 +10731,7 @@
 +
 +  public final int getTableLength() { return local_variable_table_length; }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Method.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Method.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Method.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Method.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Method.java
@@ -10967,7 +10967,7 @@
 +    return Type.getArgumentTypes(getSignature());
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Node.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Node.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Node.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Node.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Node.java
@@ -11040,7 +11040,7 @@
 +public interface Node {
 +  public void accept(Visitor obj);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/PMGClass.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/PMGClass.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/PMGClass.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/PMGClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/PMGClass.java
@@ -11237,7 +11237,7 @@
 +    return (PMGClass)clone();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Signature.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Signature.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Signature.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Signature.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Signature.java
@@ -11541,7 +11541,7 @@
 +    return (Signature)clone();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/SourceFile.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/SourceFile.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/SourceFile.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/SourceFile.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/SourceFile.java
@@ -11722,7 +11722,7 @@
 +    return (SourceFile)clone();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMap.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMap.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMap.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMap.java
@@ -11915,7 +11915,7 @@
 +
 +  public final int getMapLength() { return map_length; }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java
@@ -12132,7 +12132,7 @@
 +    this.constant_pool = constant_pool;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMapType.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMapType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMapType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMapType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/StackMapType.java
@@ -12312,7 +12312,7 @@
 +    this.constant_pool = constant_pool;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Synthetic.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Synthetic.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Synthetic.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Synthetic.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Synthetic.java
@@ -12496,7 +12496,7 @@
 +    return c;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Unknown.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Unknown.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Unknown.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Unknown.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Unknown.java
@@ -12717,7 +12717,7 @@
 +    return c;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Utility.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Utility.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Utility.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Utility.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Utility.java
@@ -14119,7 +14119,7 @@
 +    return buf.toString();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java
@@ -14228,7 +14228,7 @@
 +  public void visitStackMap(StackMap obj);
 +  public void visitStackMapEntry(StackMapEntry obj);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/classfile/package.html
@@ -14247,7 +14247,7 @@
 +</p>
 +</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AALOAD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AALOAD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AALOAD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AALOAD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AALOAD.java
@@ -14342,7 +14342,7 @@
 +    v.visitAALOAD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AASTORE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AASTORE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AASTORE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AASTORE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AASTORE.java
@@ -14437,7 +14437,7 @@
 +    v.visitAASTORE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java
@@ -14539,7 +14539,7 @@
 +    v.visitACONST_NULL(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ALOAD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ALOAD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ALOAD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ALOAD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ALOAD.java
@@ -14639,7 +14639,7 @@
 +    v.visitALOAD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java
@@ -14761,7 +14761,7 @@
 +    return (t instanceof ObjectType)? (ObjectType) t : null;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ARETURN.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ARETURN.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ARETURN.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ARETURN.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ARETURN.java
@@ -14857,7 +14857,7 @@
 +    v.visitARETURN(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java
@@ -14957,7 +14957,7 @@
 +    v.visitARRAYLENGTH(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ASTORE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ASTORE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ASTORE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ASTORE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ASTORE.java
@@ -15057,7 +15057,7 @@
 +    v.visitASTORE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ATHROW.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ATHROW.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ATHROW.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ATHROW.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ATHROW.java
@@ -15157,7 +15157,7 @@
 +    v.visitATHROW(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java
@@ -15228,7 +15228,7 @@
 + * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
 + */
 +public interface AllocationInstruction {}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java
@@ -15342,7 +15342,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java
@@ -15456,7 +15456,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArrayType.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArrayType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArrayType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArrayType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ArrayType.java
@@ -15620,7 +15620,7 @@
 +      return false;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BALOAD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BALOAD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BALOAD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BALOAD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BALOAD.java
@@ -15715,7 +15715,7 @@
 +    v.visitBALOAD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BASTORE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BASTORE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BASTORE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BASTORE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BASTORE.java
@@ -15810,7 +15810,7 @@
 +    v.visitBASTORE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BIPUSH.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BIPUSH.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BIPUSH.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BIPUSH.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BIPUSH.java
@@ -15949,7 +15949,7 @@
 +    v.visitBIPUSH(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java
@@ -16036,7 +16036,7 @@
 +    v.visitBREAKPOINT(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BasicType.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BasicType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BasicType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BasicType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BasicType.java
@@ -16145,7 +16145,7 @@
 +      ((BasicType)type).type == this.type : false;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BranchHandle.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BranchHandle.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BranchHandle.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BranchHandle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BranchHandle.java
@@ -16303,7 +16303,7 @@
 +    bi = (BranchInstruction)i;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java
@@ -16557,7 +16557,7 @@
 +    position=-1;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CALOAD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CALOAD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CALOAD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CALOAD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CALOAD.java
@@ -16652,7 +16652,7 @@
 +    v.visitCALOAD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CASTORE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CASTORE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CASTORE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CASTORE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CASTORE.java
@@ -16747,7 +16747,7 @@
 +    v.visitCASTORE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java
@@ -16872,7 +16872,7 @@
 +    v.visitCHECKCAST(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CPInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CPInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CPInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CPInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CPInstruction.java
@@ -17046,7 +17046,7 @@
 +    return Type.getType(name);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassGen.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassGen.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassGen.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassGen.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassGen.java
@@ -17505,7 +17505,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassGenException.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassGenException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassGenException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassGenException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassGenException.java
@@ -17580,7 +17580,7 @@
 +  public ClassGenException() { super(); }
 +  public ClassGenException(String s) { super(s); }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassObserver.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassObserver.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassObserver.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassObserver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ClassObserver.java
@@ -17654,7 +17654,7 @@
 +public interface ClassObserver {
 +  public void notify(ClassGen clazz);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java
@@ -17864,7 +17864,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java
@@ -17947,7 +17947,7 @@
 +public interface CompoundInstruction {
 +  public InstructionList getInstructionList();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java
@@ -18741,7 +18741,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java
@@ -18818,7 +18818,7 @@
 +public interface ConstantPushInstruction extends PushInstruction, TypedInstruction {
 +  public Number getValue();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java
@@ -18927,7 +18927,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2F.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2F.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2F.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2F.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2F.java
@@ -19022,7 +19022,7 @@
 +    v.visitD2F(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2I.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2I.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2I.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2I.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2I.java
@@ -19117,7 +19117,7 @@
 +    v.visitD2I(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2L.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2L.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2L.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2L.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/D2L.java
@@ -19212,7 +19212,7 @@
 +    v.visitD2L(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DADD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DADD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DADD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DADD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DADD.java
@@ -19308,7 +19308,7 @@
 +    v.visitDADD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DALOAD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DALOAD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DALOAD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DALOAD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DALOAD.java
@@ -19403,7 +19403,7 @@
 +    v.visitDALOAD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DASTORE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DASTORE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DASTORE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DASTORE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DASTORE.java
@@ -19498,7 +19498,7 @@
 +    v.visitDASTORE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCMPG.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCMPG.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCMPG.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCMPG.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCMPG.java
@@ -19599,7 +19599,7 @@
 +    v.visitDCMPG(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCMPL.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCMPL.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCMPL.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCMPL.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCMPL.java
@@ -19699,7 +19699,7 @@
 +    v.visitDCMPL(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCONST.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCONST.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCONST.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCONST.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DCONST.java
@@ -19818,7 +19818,7 @@
 +    v.visitDCONST(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DDIV.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DDIV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DDIV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DDIV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DDIV.java
@@ -19914,7 +19914,7 @@
 +    v.visitDDIV(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DLOAD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DLOAD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DLOAD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DLOAD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DLOAD.java
@@ -20014,7 +20014,7 @@
 +    v.visitDLOAD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DMUL.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DMUL.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DMUL.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DMUL.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DMUL.java
@@ -20110,7 +20110,7 @@
 +    v.visitDMUL(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DNEG.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DNEG.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DNEG.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DNEG.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DNEG.java
@@ -20203,7 +20203,7 @@
 +    v.visitDNEG(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DREM.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DREM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DREM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DREM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DREM.java
@@ -20299,7 +20299,7 @@
 +    v.visitDREM(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DRETURN.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DRETURN.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DRETURN.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DRETURN.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DRETURN.java
@@ -20394,7 +20394,7 @@
 +    v.visitDRETURN(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DSTORE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DSTORE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DSTORE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DSTORE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DSTORE.java
@@ -20494,7 +20494,7 @@
 +    v.visitDSTORE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DSUB.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DSUB.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DSUB.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DSUB.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DSUB.java
@@ -20590,7 +20590,7 @@
 +    v.visitDSUB(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP.java
@@ -20682,7 +20682,7 @@
 +    v.visitDUP(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2.java
@@ -20774,7 +20774,7 @@
 +    v.visitDUP2(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java
@@ -20864,7 +20864,7 @@
 +    v.visitDUP2_X1(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java
@@ -20954,7 +20954,7 @@
 +    v.visitDUP2_X2(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP_X1.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP_X1.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP_X1.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP_X1.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP_X1.java
@@ -21044,7 +21044,7 @@
 +    v.visitDUP_X1(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP_X2.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP_X2.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP_X2.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP_X2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/DUP_X2.java
@@ -21134,7 +21134,7 @@
 +    v.visitDUP_X2(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java
@@ -21386,7 +21386,7 @@
 +  public void visitFADD(FADD obj) { }
 +  public void visitBREAKPOINT(BREAKPOINT obj) { }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java
@@ -21473,7 +21473,7 @@
 +public interface ExceptionThrower {
 +  public java.lang.Class[] getExceptions();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2D.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2D.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2D.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2D.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2D.java
@@ -21568,7 +21568,7 @@
 +    v.visitF2D(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2I.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2I.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2I.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2I.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2I.java
@@ -21663,7 +21663,7 @@
 +    v.visitF2I(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2L.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2L.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2L.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2L.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/F2L.java
@@ -21758,7 +21758,7 @@
 +    v.visitF2L(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FADD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FADD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FADD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FADD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FADD.java
@@ -21853,7 +21853,7 @@
 +    v.visitFADD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FALOAD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FALOAD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FALOAD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FALOAD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FALOAD.java
@@ -21948,7 +21948,7 @@
 +    v.visitFALOAD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FASTORE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FASTORE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FASTORE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FASTORE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FASTORE.java
@@ -22043,7 +22043,7 @@
 +    v.visitFASTORE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCMPG.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCMPG.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCMPG.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCMPG.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCMPG.java
@@ -22142,7 +22142,7 @@
 +    v.visitFCMPG(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCMPL.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCMPL.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCMPL.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCMPL.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCMPL.java
@@ -22241,7 +22241,7 @@
 +    v.visitFCMPL(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCONST.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCONST.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCONST.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCONST.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FCONST.java
@@ -22362,7 +22362,7 @@
 +    v.visitFCONST(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FDIV.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FDIV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FDIV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FDIV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FDIV.java
@@ -22457,7 +22457,7 @@
 +    v.visitFDIV(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FLOAD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FLOAD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FLOAD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FLOAD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FLOAD.java
@@ -22557,7 +22557,7 @@
 +    v.visitFLOAD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FMUL.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FMUL.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FMUL.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FMUL.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FMUL.java
@@ -22652,7 +22652,7 @@
 +    v.visitFMUL(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FNEG.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FNEG.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FNEG.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FNEG.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FNEG.java
@@ -22745,7 +22745,7 @@
 +    v.visitFNEG(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FREM.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FREM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FREM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FREM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FREM.java
@@ -22840,7 +22840,7 @@
 +    v.visitFREM(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FRETURN.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FRETURN.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FRETURN.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FRETURN.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FRETURN.java
@@ -22935,7 +22935,7 @@
 +    v.visitFRETURN(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FSTORE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FSTORE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FSTORE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FSTORE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FSTORE.java
@@ -23035,7 +23035,7 @@
 +    v.visitFSTORE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FSUB.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FSUB.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FSUB.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FSUB.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FSUB.java
@@ -23130,7 +23130,7 @@
 +    v.visitFSUB(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldGen.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldGen.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldGen.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldGen.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldGen.java
@@ -23448,7 +23448,7 @@
 +    return fg;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java
@@ -23591,7 +23591,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java
@@ -23714,7 +23714,7 @@
 +    return getName(cpg);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldObserver.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldObserver.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldObserver.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldObserver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldObserver.java
@@ -23788,7 +23788,7 @@
 +public interface FieldObserver {
 +  public void notify(FieldGen field);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java
@@ -23913,7 +23913,7 @@
 +    return getClassType(cpg);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GETFIELD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GETFIELD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GETFIELD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GETFIELD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GETFIELD.java
@@ -24038,7 +24038,7 @@
 +    v.visitGETFIELD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java
@@ -24159,7 +24159,7 @@
 +    v.visitGETSTATIC(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GOTO.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GOTO.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GOTO.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GOTO.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GOTO.java
@@ -24289,7 +24289,7 @@
 +    v.visitGOTO(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GOTO_W.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GOTO_W.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GOTO_W.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GOTO_W.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GOTO_W.java
@@ -24407,7 +24407,7 @@
 +    v.visitGOTO_W(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java
@@ -24490,7 +24490,7 @@
 +   */
 +  GotoInstruction(){}
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2B.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2B.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2B.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2B.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2B.java
@@ -24585,7 +24585,7 @@
 +    v.visitI2B(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2C.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2C.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2C.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2C.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2C.java
@@ -24680,7 +24680,7 @@
 +    v.visitI2C(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2D.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2D.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2D.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2D.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2D.java
@@ -24775,7 +24775,7 @@
 +    v.visitI2D(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2F.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2F.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2F.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2F.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2F.java
@@ -24870,7 +24870,7 @@
 +    v.visitI2F(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2L.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2L.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2L.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2L.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2L.java
@@ -24965,7 +24965,7 @@
 +    v.visitI2L(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2S.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2S.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2S.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2S.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/I2S.java
@@ -25058,7 +25058,7 @@
 +    v.visitI2S(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IADD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IADD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IADD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IADD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IADD.java
@@ -25153,7 +25153,7 @@
 +    v.visitIADD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IALOAD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IALOAD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IALOAD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IALOAD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IALOAD.java
@@ -25249,7 +25249,7 @@
 +    v.visitIALOAD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IAND.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IAND.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IAND.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IAND.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IAND.java
@@ -25342,7 +25342,7 @@
 +    v.visitIAND(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IASTORE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IASTORE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IASTORE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IASTORE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IASTORE.java
@@ -25438,7 +25438,7 @@
 +    v.visitIASTORE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ICONST.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ICONST.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ICONST.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ICONST.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ICONST.java
@@ -25555,7 +25555,7 @@
 +    v.visitICONST(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IDIV.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IDIV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IDIV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IDIV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IDIV.java
@@ -25657,7 +25657,7 @@
 +    v.visitIDIV(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFEQ.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFEQ.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFEQ.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFEQ.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFEQ.java
@@ -25763,7 +25763,7 @@
 +    v.visitIFEQ(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFGE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFGE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFGE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFGE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFGE.java
@@ -25869,7 +25869,7 @@
 +    v.visitIFGE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFGT.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFGT.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFGT.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFGT.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFGT.java
@@ -25975,7 +25975,7 @@
 +    v.visitIFGT(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFLE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFLE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFLE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFLE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFLE.java
@@ -26081,7 +26081,7 @@
 +    v.visitIFLE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFLT.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFLT.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFLT.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFLT.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFLT.java
@@ -26187,7 +26187,7 @@
 +    v.visitIFLT(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNE.java
@@ -26293,7 +26293,7 @@
 +    v.visitIFNE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java
@@ -26398,7 +26398,7 @@
 +    v.visitIFNONNULL(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNULL.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNULL.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNULL.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNULL.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IFNULL.java
@@ -26504,7 +26504,7 @@
 +    v.visitIFNULL(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java
@@ -26609,7 +26609,7 @@
 +    v.visitIF_ACMPEQ(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java
@@ -26715,7 +26715,7 @@
 +    v.visitIF_ACMPNE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java
@@ -26821,7 +26821,7 @@
 +    v.visitIF_ICMPEQ(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java
@@ -26927,7 +26927,7 @@
 +    v.visitIF_ICMPGE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java
@@ -27033,7 +27033,7 @@
 +    v.visitIF_ICMPGT(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java
@@ -27139,7 +27139,7 @@
 +    v.visitIF_ICMPLE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java
@@ -27245,7 +27245,7 @@
 +    v.visitIF_ICMPLT(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java
@@ -27351,7 +27351,7 @@
 +    v.visitIF_ICMPNE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IINC.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IINC.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IINC.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IINC.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IINC.java
@@ -27542,7 +27542,7 @@
 +    v.visitIINC(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ILOAD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ILOAD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ILOAD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ILOAD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ILOAD.java
@@ -27642,7 +27642,7 @@
 +    v.visitILOAD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java
@@ -27730,7 +27730,7 @@
 +    v.visitIMPDEP1(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java
@@ -27818,7 +27818,7 @@
 +    v.visitIMPDEP2(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMUL.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMUL.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMUL.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMUL.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IMUL.java
@@ -27913,7 +27913,7 @@
 +    v.visitIMUL(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INEG.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INEG.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INEG.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INEG.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INEG.java
@@ -28006,7 +28006,7 @@
 +    v.visitINEG(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java
@@ -28120,7 +28120,7 @@
 +    v.visitINSTANCEOF(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java
@@ -28291,7 +28291,7 @@
 +    v.visitINVOKEINTERFACE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java
@@ -28412,7 +28412,7 @@
 +    v.visitINVOKESPECIAL(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java
@@ -28530,7 +28530,7 @@
 +    v.visitINVOKESTATIC(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java
@@ -28650,7 +28650,7 @@
 +    v.visitINVOKEVIRTUAL(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IOR.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IOR.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IOR.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IOR.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IOR.java
@@ -28743,7 +28743,7 @@
 +    v.visitIOR(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IREM.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IREM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IREM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IREM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IREM.java
@@ -28845,7 +28845,7 @@
 +    v.visitIREM(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IRETURN.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IRETURN.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IRETURN.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IRETURN.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IRETURN.java
@@ -28940,7 +28940,7 @@
 +    v.visitIRETURN(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISHL.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISHL.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISHL.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISHL.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISHL.java
@@ -29033,7 +29033,7 @@
 +    v.visitISHL(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISHR.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISHR.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISHR.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISHR.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISHR.java
@@ -29126,7 +29126,7 @@
 +    v.visitISHR(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISTORE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISTORE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISTORE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISTORE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISTORE.java
@@ -29226,7 +29226,7 @@
 +    v.visitISTORE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISUB.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISUB.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISUB.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISUB.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ISUB.java
@@ -29321,7 +29321,7 @@
 +    v.visitISUB(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IUSHR.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IUSHR.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IUSHR.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IUSHR.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IUSHR.java
@@ -29414,7 +29414,7 @@
 +    v.visitIUSHR(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IXOR.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IXOR.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IXOR.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IXOR.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IXOR.java
@@ -29507,7 +29507,7 @@
 +    v.visitIXOR(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IfInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IfInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IfInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IfInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IfInstruction.java
@@ -29596,7 +29596,7 @@
 +   */
 +  public abstract IfInstruction negate();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java
@@ -29671,7 +29671,7 @@
 +  public int getIndex();
 +  public void setIndex(int index);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Instruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Instruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Instruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Instruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Instruction.java
@@ -29984,7 +29984,7 @@
 +      cmp.equals(this, (Instruction)that) : false;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java
@@ -30101,7 +30101,7 @@
 +
 +  public boolean equals(Instruction i1, Instruction i2);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java
@@ -30435,7 +30435,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java
@@ -31066,7 +31066,7 @@
 +  public void            setConstantPool(ConstantPoolGen c) { cp = c; }
 +  public ConstantPoolGen getConstantPool()                  { return cp; }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java
@@ -31358,7 +31358,7 @@
 +    instruction.accept(v);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionList.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionList.java
@@ -32652,7 +32652,7 @@
 +        ((InstructionListObserver)e.next()).notify(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java
@@ -32726,7 +32726,7 @@
 +public interface InstructionListObserver {
 +  public void notify(InstructionList list);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java
@@ -32804,7 +32804,7 @@
 +  public boolean containsTarget(InstructionHandle ih);
 +  public void updateTarget(InstructionHandle old_ih, InstructionHandle new_ih);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java
@@ -32958,7 +32958,7 @@
 +    return Type.getArgumentTypes(getSignature(cpg));
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JSR.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JSR.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JSR.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JSR.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JSR.java
@@ -33085,7 +33085,7 @@
 +    v.visitJSR(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JSR_W.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JSR_W.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JSR_W.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JSR_W.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JSR_W.java
@@ -33203,7 +33203,7 @@
 +    v.visitJSR_W(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java
@@ -33326,7 +33326,7 @@
 +    return toThis.getNext();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2D.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2D.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2D.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2D.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2D.java
@@ -33419,7 +33419,7 @@
 +    v.visitL2D(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2F.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2F.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2F.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2F.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2F.java
@@ -33512,7 +33512,7 @@
 +    v.visitL2F(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2I.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2I.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2I.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2I.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/L2I.java
@@ -33605,7 +33605,7 @@
 +    v.visitL2I(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LADD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LADD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LADD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LADD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LADD.java
@@ -33699,7 +33699,7 @@
 +    v.visitLADD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LALOAD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LALOAD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LALOAD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LALOAD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LALOAD.java
@@ -33794,7 +33794,7 @@
 +    v.visitLALOAD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LAND.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LAND.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LAND.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LAND.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LAND.java
@@ -33888,7 +33888,7 @@
 +    v.visitLAND(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LASTORE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LASTORE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LASTORE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LASTORE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LASTORE.java
@@ -33983,7 +33983,7 @@
 +    v.visitLASTORE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LCMP.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LCMP.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LCMP.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LCMP.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LCMP.java
@@ -34083,7 +34083,7 @@
 +    v.visitLCMP(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LCONST.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LCONST.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LCONST.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LCONST.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LCONST.java
@@ -34202,7 +34202,7 @@
 +    v.visitLCONST(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC.java
@@ -34382,7 +34382,7 @@
 +    v.visitLDC(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC2_W.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC2_W.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC2_W.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC2_W.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC2_W.java
@@ -34506,7 +34506,7 @@
 +    v.visitLDC2_W(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC_W.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC_W.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC_W.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC_W.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDC_W.java
@@ -34602,7 +34602,7 @@
 +    opcode = com.sun.org.apache.bcel.internal.Constants.LDC_W;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDIV.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDIV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDIV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDIV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LDIV.java
@@ -34701,7 +34701,7 @@
 +    v.visitLDIV(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LLOAD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LLOAD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LLOAD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LLOAD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LLOAD.java
@@ -34798,7 +34798,7 @@
 +    v.visitLLOAD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LMUL.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LMUL.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LMUL.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LMUL.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LMUL.java
@@ -34892,7 +34892,7 @@
 +    v.visitLMUL(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LNEG.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LNEG.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LNEG.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LNEG.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LNEG.java
@@ -34985,7 +34985,7 @@
 +    v.visitLNEG(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java
@@ -35126,7 +35126,7 @@
 +    v.visitLOOKUPSWITCH(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LOR.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LOR.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LOR.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LOR.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LOR.java
@@ -35219,7 +35219,7 @@
 +    v.visitLOR(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LREM.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LREM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LREM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LREM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LREM.java
@@ -35315,7 +35315,7 @@
 +    v.visitLREM(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LRETURN.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LRETURN.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LRETURN.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LRETURN.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LRETURN.java
@@ -35408,7 +35408,7 @@
 +    v.visitLRETURN(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSHL.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSHL.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSHL.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSHL.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSHL.java
@@ -35501,7 +35501,7 @@
 +    v.visitLSHL(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSHR.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSHR.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSHR.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSHR.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSHR.java
@@ -35594,7 +35594,7 @@
 +    v.visitLSHR(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSTORE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSTORE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSTORE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSTORE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSTORE.java
@@ -35691,7 +35691,7 @@
 +    v.visitLSTORE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSUB.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSUB.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSUB.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSUB.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LSUB.java
@@ -35785,7 +35785,7 @@
 +    v.visitLSUB(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LUSHR.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LUSHR.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LUSHR.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LUSHR.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LUSHR.java
@@ -35878,7 +35878,7 @@
 +    v.visitLUSHR(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LXOR.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LXOR.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LXOR.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LXOR.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LXOR.java
@@ -35971,7 +35971,7 @@
 +    v.visitLXOR(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java
@@ -36110,7 +36110,7 @@
 +  public void              setSourceLine(int src_line)    { this.src_line = src_line; }
 +  public int               getSourceLine()                { return src_line; }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LoadClass.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LoadClass.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LoadClass.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LoadClass.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LoadClass.java
@@ -36204,7 +36204,7 @@
 +   */
 +  public Type getType(ConstantPoolGen cpg);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java
@@ -36312,7 +36312,7 @@
 +    v.visitLoadInstruction(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java
@@ -36524,7 +36524,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java
@@ -36758,7 +36758,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java
@@ -36854,7 +36854,7 @@
 +    v.visitMONITORENTER(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java
@@ -36950,7 +36950,7 @@
 +    v.visitMONITOREXIT(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java
@@ -37130,7 +37130,7 @@
 +    v.visitMULTIANEWARRAY(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java
@@ -38113,7 +38113,7 @@
 +    return mg;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MethodObserver.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MethodObserver.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MethodObserver.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MethodObserver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/MethodObserver.java
@@ -38187,7 +38187,7 @@
 +public interface MethodObserver {
 +  public void notify(MethodGen method);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NEW.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NEW.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NEW.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NEW.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NEW.java
@@ -38306,7 +38306,7 @@
 +    v.visitNEW(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java
@@ -38454,7 +38454,7 @@
 +    v.visitNEWARRAY(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NOP.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NOP.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NOP.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NOP.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NOP.java
@@ -38542,7 +38542,7 @@
 +    v.visitNOP(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java
@@ -38620,7 +38620,7 @@
 +  public void   setType(Type type);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ObjectType.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ObjectType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ObjectType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ObjectType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ObjectType.java
@@ -38764,7 +38764,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/POP.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/POP.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/POP.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/POP.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/POP.java
@@ -38857,7 +38857,7 @@
 +    v.visitPOP(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/POP2.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/POP2.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/POP2.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/POP2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/POP2.java
@@ -38950,7 +38950,7 @@
 +    v.visitPOP2(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUSH.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUSH.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUSH.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUSH.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUSH.java
@@ -39153,7 +39153,7 @@
 +    return instruction.toString() + " (PUSH)";
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java
@@ -39279,7 +39279,7 @@
 +    v.visitPUTFIELD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java
@@ -39401,7 +39401,7 @@
 +    v.visitPUTSTATIC(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PopInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PopInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PopInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PopInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PopInstruction.java
@@ -39476,7 +39476,7 @@
 + */
 +public interface PopInstruction extends StackConsumer {
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PushInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PushInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PushInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PushInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/PushInstruction.java
@@ -39556,7 +39556,7 @@
 + */
 +public interface PushInstruction extends StackProducer {
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/RET.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/RET.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/RET.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/RET.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/RET.java
@@ -39725,7 +39725,7 @@
 +    v.visitRET(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/RETURN.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/RETURN.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/RETURN.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/RETURN.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/RETURN.java
@@ -39818,7 +39818,7 @@
 +    v.visitRETURN(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReferenceType.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReferenceType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReferenceType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReferenceType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReferenceType.java
@@ -40175,7 +40175,7 @@
 +    return null;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java
@@ -40286,7 +40286,7 @@
 +    return getType();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java
@@ -40396,7 +40396,7 @@
 +    return returnTarget;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SALOAD.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SALOAD.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SALOAD.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SALOAD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SALOAD.java
@@ -40489,7 +40489,7 @@
 +    v.visitSALOAD(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SASTORE.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SASTORE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SASTORE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SASTORE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SASTORE.java
@@ -40582,7 +40582,7 @@
 +    v.visitSASTORE(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SIPUSH.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SIPUSH.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SIPUSH.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SIPUSH.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SIPUSH.java
@@ -40718,7 +40718,7 @@
 +    v.visitSIPUSH(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SWAP.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SWAP.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SWAP.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SWAP.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SWAP.java
@@ -40810,7 +40810,7 @@
 +    v.visitSWAP(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SWITCH.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SWITCH.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SWITCH.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SWITCH.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/SWITCH.java
@@ -41001,7 +41001,7 @@
 +    return instruction;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Select.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Select.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Select.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Select.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Select.java
@@ -41263,7 +41263,7 @@
 +   */
 +  public InstructionHandle[] getTargets() { return targets; }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackConsumer.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackConsumer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackConsumer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackConsumer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackConsumer.java
@@ -41338,7 +41338,7 @@
 +   */
 +  public int consumeStack(ConstantPoolGen cpg);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackInstruction.java
@@ -41428,7 +41428,7 @@
 +    return Type.UNKNOWN;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackProducer.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackProducer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackProducer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackProducer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StackProducer.java
@@ -41504,7 +41504,7 @@
 +   */
 +  public int produceStack(ConstantPoolGen cpg);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java
@@ -41612,7 +41612,7 @@
 +    v.visitStoreInstruction(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java
@@ -41767,7 +41767,7 @@
 +    v.visitTABLESWITCH(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TargetLostException.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TargetLostException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TargetLostException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TargetLostException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TargetLostException.java
@@ -41875,7 +41875,7 @@
 +   */
 +  public InstructionHandle[] getTargets() { return targets; }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Type.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Type.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Type.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Type.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Type.java
@@ -42170,7 +42170,7 @@
 +    return sb.toString();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java
@@ -42244,7 +42244,7 @@
 +public interface TypedInstruction {
 +  public Type getType(ConstantPoolGen cpg);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java
@@ -42318,7 +42318,7 @@
 + * @see JSR
 + */
 +public interface UnconditionalBranch {}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java
@@ -42395,7 +42395,7 @@
 + * @see TABLESWITCH
 + */
 +public interface VariableLengthInstruction {}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Visitor.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Visitor.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Visitor.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Visitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/Visitor.java
@@ -42650,7 +42650,7 @@
 +  public void visitFADD(FADD obj);
 +  public void visitBREAKPOINT(BREAKPOINT obj);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/generic/package.html
@@ -42671,7 +42671,7 @@
 +</p>
 +</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/package.html
@@ -42693,7 +42693,7 @@
 +</p>
 +</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/AttributeHTML.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/AttributeHTML.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/AttributeHTML.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/AttributeHTML.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/AttributeHTML.java
@@ -42956,7 +42956,7 @@
 +    file.flush();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/BCELFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/BCELFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/BCELFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/BCELFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/BCELFactory.java
@@ -43321,7 +43321,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/BCELifier.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/BCELifier.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/BCELifier.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/BCELifier.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/BCELifier.java
@@ -43633,7 +43633,7 @@
 +    bcelifier.start();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ByteSequence.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ByteSequence.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ByteSequence.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ByteSequence.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ByteSequence.java
@@ -43723,7 +43723,7 @@
 +    final void unreadByte()  { if(pos > 0) pos--; }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java
@@ -43993,7 +43993,7 @@
 +      attribute_html.writeAttribute(attributes[i], "class" + i);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassLoader.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassLoader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassLoader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassLoader.java
@@ -44222,7 +44222,7 @@
 +    return clazz;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java
@@ -44384,7 +44384,7 @@
 +    loadedClasses.clear();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassPath.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassPath.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassPath.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassPath.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassPath.java
@@ -44771,7 +44771,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassQueue.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassQueue.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassQueue.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassQueue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassQueue.java
@@ -44860,7 +44860,7 @@
 +    return vec.toString();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassSet.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassSet.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassSet.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassSet.java
@@ -44964,7 +44964,7 @@
 +    return (String[])_map.keySet().toArray(new String[_map.keySet().size()]);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassStack.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassStack.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassStack.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassStack.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassStack.java
@@ -45045,7 +45045,7 @@
 +  public JavaClass top()                 { return (JavaClass)stack.peek(); }
 +  public boolean   empty()               { return stack.empty(); }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassVector.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassVector.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassVector.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassVector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ClassVector.java
@@ -45132,7 +45132,7 @@
 +    return classes;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/CodeHTML.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/CodeHTML.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/CodeHTML.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/CodeHTML.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/CodeHTML.java
@@ -45758,7 +45758,7 @@
 +
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ConstantHTML.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ConstantHTML.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ConstantHTML.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ConstantHTML.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/ConstantHTML.java
@@ -46028,7 +46028,7 @@
 +    return -1;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/InstructionFinder.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/InstructionFinder.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/InstructionFinder.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/InstructionFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/InstructionFinder.java
@@ -46476,7 +46476,7 @@
 +    return buf.toString();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java
@@ -46635,7 +46635,7 @@
 +    wrapper.runMain(class_name, new_argv);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/MethodHTML.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/MethodHTML.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/MethodHTML.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/MethodHTML.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/MethodHTML.java
@@ -46842,7 +46842,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/Repository.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/Repository.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/Repository.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/Repository.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/Repository.java
@@ -46952,7 +46952,7 @@
 +   */
 +  public void clear();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java
@@ -47164,7 +47164,7 @@
 +    _loadedClasses.clear();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/bcel/internal/util/package.html
@@ -47194,7 +47194,7 @@
 +</p>
 +</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java
@@ -47275,7 +47275,7 @@
 +        return (pos >= len);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/CharacterIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/CharacterIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/CharacterIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/CharacterIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/CharacterIterator.java
@@ -47322,7 +47322,7 @@
 +    /** @return <tt>true</tt> iff if the specified index is after the end of the character stream */
 +    boolean isEnd(int pos);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RE.java b/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RE.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RE.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RE.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RE.java
@@ -49087,7 +49087,7 @@
 +        return ((int)c1 - (int)c2);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RECompiler.java b/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RECompiler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RECompiler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RECompiler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RECompiler.java
@@ -50612,7 +50612,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REDebugCompiler.java b/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REDebugCompiler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REDebugCompiler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REDebugCompiler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REDebugCompiler.java
@@ -50842,7 +50842,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REProgram.java b/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REProgram.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REProgram.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REProgram.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REProgram.java
@@ -51005,7 +51005,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RESyntaxException.java b/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RESyntaxException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RESyntaxException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RESyntaxException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RESyntaxException.java
@@ -51053,7 +51053,7 @@
 +        super("Syntax error: " + s);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RETest.java b/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RETest.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RETest.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RETest.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/RETest.java
@@ -51941,7 +51941,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REUtil.java b/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REUtil.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REUtil.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/REUtil.java
@@ -52007,7 +52007,7 @@
 +        return createRE(expression, RE.MATCH_NORMAL);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java
@@ -52176,7 +52176,7 @@
 +        read(idx + 1 - buff.length());
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java
@@ -52342,7 +52342,7 @@
 +        read(idx + 1 - buff.length());
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/StringCharacterIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/StringCharacterIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/StringCharacterIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/StringCharacterIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/StringCharacterIterator.java
@@ -52409,7 +52409,7 @@
 +        return (pos >= src.length());
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/recompile.java b/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/recompile.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/recompile.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/recompile.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/regexp/internal/recompile.java
@@ -52551,26 +52551,26 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/javax.xml.transform.TransformerFactory b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/javax.xml.transform.TransformerFactory
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/javax.xml.transform.TransformerFactory openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/javax.xml.transform.TransformerFactory
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/javax.xml.transform.TransformerFactory
 @@ -0,0 +1,1 @@
 +com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/javax.xml.xpath.XPathFactory b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/javax.xml.xpath.XPathFactory
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/javax.xml.xpath.XPathFactory openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/javax.xml.xpath.XPathFactory
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/javax.xml.xpath.XPathFactory
 @@ -0,0 +1,1 @@
 +com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl
 \ No newline at end of file
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/org.apache.xml.dtm.DTMManager b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/org.apache.xml.dtm.DTMManager
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/org.apache.xml.dtm.DTMManager openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/org.apache.xml.dtm.DTMManager
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/META-INF/services/org.apache.xml.dtm.DTMManager
 @@ -0,0 +1,1 @@
 +com.sun.org.apache.xml.internal.dtm.ref.DTMManagerDefault
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/Version.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/Version.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/Version.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/Version.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/Version.java
@@ -52730,7 +52730,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java
@@ -52830,7 +52830,7 @@
 +            throws javax.xml.transform.TransformerException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/extensions/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/extensions/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/extensions/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/extensions/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/extensions/package.html
@@ -52863,7 +52863,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltBase.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltBase.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltBase.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltBase.java
@@ -52954,7 +52954,7 @@
 +    return d;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java
@@ -53067,7 +53067,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java
@@ -54194,7 +54194,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java
@@ -54815,7 +54815,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltMath.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltMath.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltMath.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltMath.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltMath.java
@@ -55211,7 +55211,7 @@
 +   }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java
@@ -55457,7 +55457,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java
@@ -55819,7 +55819,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/Extensions.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/Extensions.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/Extensions.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/Extensions.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/Extensions.java
@@ -56244,7 +56244,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/NodeInfo.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/NodeInfo.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/NodeInfo.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/NodeInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/NodeInfo.java
@@ -56499,7 +56499,7 @@
 +      return -1;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ObjectFactory.java
@@ -57165,7 +57165,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/SecuritySupport.java
@@ -57297,7 +57297,7 @@
 +        return f.lastModified();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/SecuritySupport12.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/SecuritySupport12.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/SecuritySupport12.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/SecuritySupport12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/SecuritySupport12.java
@@ -57450,7 +57450,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/package.html
@@ -57484,7 +57484,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLMessages.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLMessages.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLMessages.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLMessages.java
@@ -57578,7 +57578,7 @@
 +      return "Could not load any resource bundles.";
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java
@@ -59096,7 +59096,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
@@ -61578,7 +61578,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java
@@ -61616,7 +61616,7 @@
 +public class XSLTErrorResources_en extends XSLTErrorResources
 +{
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java
@@ -64098,7 +64098,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java
@@ -66580,7 +66580,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java
@@ -69062,7 +69062,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java
@@ -71544,7 +71544,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java
@@ -74026,7 +74026,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
@@ -76730,7 +76730,7 @@
 +  public static final String QUERY_HEADER = "M\u00d6NSTER ";
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
@@ -79212,7 +79212,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java
@@ -81694,7 +81694,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties
@@ -81731,7 +81731,7 @@
 +
 +# W3C XSL Transformations (XSLT) Version 1.0
 +version=1.0
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/res/package.html
@@ -81764,7 +81764,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/templates/Constants.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/templates/Constants.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/templates/Constants.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/templates/Constants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/templates/Constants.java
@@ -82170,7 +82170,7 @@
 +  /** temp dummy         */
 +  public static final String ATTRNAME_XXXX = "XXXX";
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/templates/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/templates/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/templates/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/templates/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/templates/package.html
@@ -82190,7 +82190,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
@@ -83492,7 +83492,7 @@
 +    outWriter.println(s);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/ObjectFactory.java
@@ -84160,7 +84160,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/Process.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/Process.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/Process.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/Process.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/Process.java
@@ -85391,7 +85391,7 @@
 +    System.err.println(XSLMessages.createMessage("xslProc_invalid_xalan_option", new Object[]{option}));
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/SecuritySupport.java
@@ -85523,7 +85523,7 @@
 +        return f.lastModified();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/SecuritySupport12.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/SecuritySupport12.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/SecuritySupport12.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/SecuritySupport12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/SecuritySupport12.java
@@ -85676,7 +85676,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/package.html
@@ -85709,7 +85709,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java
@@ -85751,7 +85751,7 @@
 +    public Collator getCollator(String lang, String country);
 +    public Collator getCollator(Locale locale);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOM.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOM.java
@@ -85863,7 +85863,7 @@
 +    public String getUnparsedEntityURI(String name);
 +    public Hashtable getElementsWithIDs();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java
@@ -85926,7 +85926,7 @@
 +    public DOM retrieveDocument(String baseURI, String href, Translet translet);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java
@@ -85978,7 +85978,7 @@
 +    public boolean hasDOMSource();
 +    public int getElementById(String idString);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java
@@ -86069,7 +86069,7 @@
 +    public void setRestartable(boolean isRestartable);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java
@@ -86125,7 +86125,7 @@
 +            ((DELTA > 0) ? ("."+DELTA) : ("")));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java
@@ -86163,7 +86163,7 @@
 +public interface StripFilter {
 +    public boolean stripSpace(DOM dom, int node, int type);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/Translet.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/Translet.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/Translet.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/Translet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/Translet.java
@@ -86222,7 +86222,7 @@
 +    public int[]    getTypesArray();
 +    public String[] getNamespaceArray();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/TransletException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/TransletException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/TransletException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/TransletException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/TransletException.java
@@ -86275,7 +86275,7 @@
 +	super(message);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java
@@ -86451,7 +86451,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/ObjectFactory.java
@@ -87119,7 +87119,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/SecuritySupport.java
@@ -87251,7 +87251,7 @@
 +        return f.lastModified();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/SecuritySupport12.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/SecuritySupport12.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/SecuritySupport12.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/SecuritySupport12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/SecuritySupport12.java
@@ -87404,7 +87404,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java
@@ -87706,7 +87706,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java
@@ -87969,7 +87969,7 @@
 +        private String theOptString = null;
 +    } // end class OptionMatcher
 +}// end class GetOpt
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java
@@ -88008,7 +88008,7 @@
 +        super(msg);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java
@@ -88045,7 +88045,7 @@
 +        super(msg);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java
@@ -88085,7 +88085,7 @@
 +        super(msg);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java
@@ -88218,7 +88218,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java
@@ -88365,7 +88365,7 @@
 +        return "absolutePathPattern(" + (_left != null ? _left.toString() : ")");
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java
@@ -88472,7 +88472,7 @@
 +        _falseList.append(_right._falseList);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java
@@ -88661,7 +88661,7 @@
 +        return "AncestorPattern(" + _left + ", " + _right + ')';
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java
@@ -88827,7 +88827,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java
@@ -89036,7 +89036,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java
@@ -89085,7 +89085,7 @@
 +            : _arg.toString() + ", " + _rest.toString();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java
@@ -89137,7 +89137,7 @@
 +        //!!! take care of value templates
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java
@@ -89355,7 +89355,7 @@
 +        return(buf.toString());
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java
@@ -89410,7 +89410,7 @@
 +        return result;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java
@@ -89678,7 +89678,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java
@@ -89815,7 +89815,7 @@
 +        return Ops[_op] + '(' + _left + ", " + _right + ')';
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java
@@ -89879,7 +89879,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java
@@ -89965,7 +89965,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java
@@ -90213,7 +90213,7 @@
 +     }
 +}
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java
@@ -90320,7 +90320,7 @@
 +        il.append(new CHECKCAST(cpg.addClass(_className)));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java
@@ -90564,7 +90564,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java
@@ -90619,7 +90619,7 @@
 +                                                    "ceil", "(D)D")));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java
@@ -90792,7 +90792,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java
@@ -90849,7 +90849,7 @@
 +     */
 +    public void addVariable(VariableRefBase variableRef);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java
@@ -90972,7 +90972,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java
@@ -91033,7 +91033,7 @@
 +            return(_msg);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java
@@ -91135,7 +91135,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java
@@ -91648,7 +91648,7 @@
 +
 +    public static final int RTF_INITIAL_SIZE = 32;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java
@@ -91762,7 +91762,7 @@
 +        _falseList.add(il.append(new IFLT(null)));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java
@@ -91926,7 +91926,7 @@
 +	methodGen.removeLocalVariable(length);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java
@@ -92074,7 +92074,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java
@@ -92120,7 +92120,7 @@
 +        methodGen.getInstructionList().append(methodGen.loadCurrentNode());
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java
@@ -92383,7 +92383,7 @@
 +        il.append(new INVOKEVIRTUAL(put));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java
@@ -92546,7 +92546,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java
@@ -92646,7 +92646,7 @@
 +        methodGen.getInstructionList().append(new PUSH(cpg, result));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java
@@ -93012,7 +93012,7 @@
 +        il.append(new INVOKESTATIC(compare));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java
@@ -93241,7 +93241,7 @@
 +        return result;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java
@@ -93327,7 +93327,7 @@
 +        if (_active) translateContents(classGen, methodGen);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java
@@ -93538,7 +93538,7 @@
 +	}
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java
@@ -93711,7 +93711,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java
@@ -93843,7 +93843,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java
@@ -93896,7 +93896,7 @@
 +                                                   "floor", "(D)D")));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java
@@ -94020,7 +94020,7 @@
 +        return result;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java
@@ -94223,7 +94223,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java
@@ -94344,7 +94344,7 @@
 +        il.append(new INVOKESTATIC(fn3arg));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java
@@ -94545,7 +94545,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java
@@ -95643,7 +95643,7 @@
 +        il.append(new INVOKESTATIC(index));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java
@@ -95705,7 +95705,7 @@
 +                                                    GET_NODE_NAME_SIG)));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java
@@ -95839,7 +95839,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java
@@ -95881,7 +95881,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java
@@ -95998,7 +95998,7 @@
 +        _test.backPatchTrueList(truec.getNext());
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java
@@ -96038,7 +96038,7 @@
 +        super(s);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java
@@ -96199,7 +96199,7 @@
 +        // do nothing
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java
@@ -96360,7 +96360,7 @@
 +        // do nothing
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java
@@ -96417,7 +96417,7 @@
 +        getParser().reportError(FATAL, msg);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java
@@ -96480,7 +96480,7 @@
 +        il.append(new PUSH(cpg, _value));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java
@@ -96788,7 +96788,7 @@
 +        skipNode.setTarget(skip);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java
@@ -97031,7 +97031,7 @@
 +        il.append(new INVOKEVIRTUAL(getKeyIterator));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java
@@ -97072,7 +97072,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java
@@ -97170,7 +97170,7 @@
 +        il.append(new INVOKESTATIC(tst));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java
@@ -97246,7 +97246,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java
@@ -97410,7 +97410,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java
@@ -97964,7 +97964,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java
@@ -98056,7 +98056,7 @@
 +        il.append(new PUSH(cpg, _value));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java
@@ -98137,7 +98137,7 @@
 +        il.append(new INVOKESTATIC(getLocalName));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java
@@ -98251,7 +98251,7 @@
 +        return "root()";
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java
@@ -98491,7 +98491,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Makefile.inc b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Makefile.inc
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Makefile.inc openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Makefile.inc
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Makefile.inc
@@ -98556,7 +98556,7 @@
 +.lex.java:
 +	$(JAVALEX) $(JAVALEX_FLAGS) $<
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java
@@ -98724,7 +98724,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java
@@ -100256,7 +100256,7 @@
 +        return (col > -1 && qname.charAt(qname.length()-1) == '*');
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java
@@ -100391,7 +100391,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java
@@ -100464,7 +100464,7 @@
 +        il.append(new INVOKEINTERFACE(getName, 2));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java
@@ -100526,7 +100526,7 @@
 +        // do nada
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java
@@ -100600,7 +100600,7 @@
 +        il.append(new INVOKEINTERFACE(getNamespace, 2));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java
@@ -100650,7 +100650,7 @@
 +
 +    public static final int ANODE     = DOM.FIRST_TYPE - 1;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java
@@ -100715,7 +100715,7 @@
 +        _falseList.add(gotoh);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java
@@ -101331,7 +101331,7 @@
 +	il.append(new INVOKEVIRTUAL(index));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java
@@ -101406,7 +101406,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ObjectFactory.java
@@ -102074,7 +102074,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java
@@ -102134,7 +102134,7 @@
 +        parser.reportError(Constants.ERROR, err);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java
@@ -102560,7 +102560,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java
@@ -102823,7 +102823,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java
@@ -102941,7 +102941,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java
@@ -103198,7 +103198,7 @@
 +	}
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java
@@ -103351,7 +103351,7 @@
 +        return "Parent(" + _left + ", " + _right + ')';
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java
@@ -104752,7 +104752,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java
@@ -104819,7 +104819,7 @@
 +     */
 +    public abstract double getPriority();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java
@@ -104893,7 +104893,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java
@@ -105521,7 +105521,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java
@@ -105667,7 +105667,7 @@
 +        il.append(methodGen.storeHandler());
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java
@@ -105832,7 +105832,7 @@
 +        skipFalse.setTarget(il.append(NOP));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java
@@ -105924,7 +105924,7 @@
 +	return "QName: " + _namespace + "(" + _prefix + "):" + _localname;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java
@@ -105987,7 +105987,7 @@
 +        il.append(new PUSH(cpg, _value));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java
@@ -106275,7 +106275,7 @@
 +        return Operators.getOpNames(_op) + '(' + _left + ", " + _right + ')';
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java
@@ -106313,7 +106313,7 @@
 +    public abstract int getAxis();
 +    public abstract void setAxis(int axis);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java
@@ -106348,7 +106348,7 @@
 + * @author Santiago Pericas-Geertsen
 + */
 +abstract class RelativePathPattern extends LocationPathPattern {}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java
@@ -106406,7 +106406,7 @@
 +                                                            "roundF", "(D)D")));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SecuritySupport.java
@@ -106538,7 +106538,7 @@
 +        return f.lastModified();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SecuritySupport12.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SecuritySupport12.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SecuritySupport12.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SecuritySupport12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SecuritySupport12.java
@@ -106691,7 +106691,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java
@@ -106773,7 +106773,7 @@
 +        il.append(new PUSH(cpg, _value));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java
@@ -107533,7 +107533,7 @@
 +        return extractMethod.getMethod();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java
@@ -107582,7 +107582,7 @@
 +    public InputSource loadSource(String href, String context, XSLTC xsltc);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java
@@ -107680,7 +107680,7 @@
 +                                                     "("+STRING_SIG+")Z")));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java
@@ -108217,7 +108217,7 @@
 +	return buffer.append(')').toString();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java
@@ -108749,7 +108749,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java
@@ -108830,7 +108830,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java
@@ -108892,7 +108892,7 @@
 +                                                     "length", "()I")));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java
@@ -110311,7 +110311,7 @@
 +        _templates.addElement(template);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java
@@ -110581,7 +110581,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java
@@ -111502,7 +111502,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java
@@ -111850,7 +111850,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java
@@ -112144,7 +112144,7 @@
 +        return (_start = fail);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java
@@ -112396,7 +112396,7 @@
 +        il.append(new PUSH(cpg, _text.length()));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java
@@ -112501,7 +112501,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java
@@ -112654,7 +112654,7 @@
 +        il.append(methodGen.storeHandler());
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java
@@ -112749,7 +112749,7 @@
 +        il.append(_type.NEG());
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java
@@ -112902,7 +112902,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java
@@ -112979,7 +112979,7 @@
 +                         2));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java
@@ -113088,7 +113088,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java
@@ -113245,7 +113245,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java
@@ -113368,7 +113368,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java
@@ -113513,7 +113513,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java
@@ -113709,7 +113709,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java
@@ -114010,7 +114010,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java
@@ -114114,7 +114114,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java
@@ -114279,7 +114279,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java
@@ -114391,7 +114391,7 @@
 +        getParser().reportError(Constants.ERROR, msg);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java
@@ -114939,7 +114939,7 @@
 +    public void translate(ClassGenerator classGen, MethodGenerator methodGen) {
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java
@@ -115155,7 +115155,7 @@
 +        il.append(POP); // cleanup stack
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java
@@ -116779,7 +116779,7 @@
 +		}
 +	}
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java
@@ -119930,7 +119930,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
@@ -120834,7 +120834,7 @@
 +        return newDataOffset;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java
@@ -121133,7 +121133,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java
@@ -121432,7 +121432,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java
@@ -121503,7 +121503,7 @@
 +  public static final int GT = 19;
 +  public static final int NODE = 31;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java
@@ -121587,7 +121587,7 @@
 +        return new ASTORE(index + PARAM_START_INDEX);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java
@@ -121817,7 +121817,7 @@
 +            (BranchInstruction) new IF_ICMPLE(null);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java
@@ -121959,7 +121959,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java
@@ -122084,7 +122084,7 @@
 +        return super.getLocalIndex(name);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java
@@ -123042,7 +123042,7 @@
 +    };
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java
@@ -123903,7 +123903,7 @@
 +    };
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java
@@ -124764,7 +124764,7 @@
 +    };
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
@@ -125625,7 +125625,7 @@
 +    };
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java
@@ -126486,7 +126486,7 @@
 +    };
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java
@@ -127347,7 +127347,7 @@
 +    };
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java
@@ -128208,7 +128208,7 @@
 +    };
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
@@ -129069,7 +129069,7 @@
 +    };
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java
@@ -129930,7 +129930,7 @@
 +    };
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java
@@ -130791,7 +130791,7 @@
 +    };
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
@@ -131652,7 +131652,7 @@
 +    };
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java
@@ -132513,7 +132513,7 @@
 +    };
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java
@@ -132825,7 +132825,7 @@
 +    }
 +}
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java
@@ -132896,7 +132896,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java
@@ -133203,7 +133203,7 @@
 +            (BranchInstruction) new IF_ICMPLE(null);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java
@@ -133312,7 +133312,7 @@
 +        return super.getLocalIndex(name);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java
@@ -133657,7 +133657,7 @@
 +        }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java
@@ -133835,7 +133835,7 @@
 +        return _argsType == null ? 0 : _argsType.size();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java
@@ -133897,7 +133897,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java
@@ -133969,7 +133969,7 @@
 +        return new ASTORE(index + PARAM_START_INDEX);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java
@@ -134049,7 +134049,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java
@@ -134385,7 +134385,7 @@
 +        return new ASTORE(slot);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java
@@ -134439,7 +134439,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java
@@ -134509,7 +134509,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java
@@ -134838,7 +134838,7 @@
 +        return new ISTORE(slot);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java
@@ -134882,7 +134882,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectFactory.java
@@ -135550,7 +135550,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java
@@ -135734,7 +135734,7 @@
 +        return new ASTORE(slot);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java
@@ -136082,7 +136082,7 @@
 +        return DUP2;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java
@@ -136466,7 +136466,7 @@
 +        return new ASTORE(slot);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java
@@ -136936,7 +136936,7 @@
 +        return new ASTORE(slot);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java
@@ -137011,7 +137011,7 @@
 +        return INVALID_INDEX;           // not available
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SecuritySupport.java
@@ -137143,7 +137143,7 @@
 +        return f.lastModified();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SecuritySupport12.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SecuritySupport12.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SecuritySupport12.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SecuritySupport12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SecuritySupport12.java
@@ -137296,7 +137296,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java
@@ -137403,7 +137403,7 @@
 +        throw new Error(err.toString());
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java
@@ -137453,7 +137453,7 @@
 +        return (String) super.push(val);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java
@@ -137689,7 +137689,7 @@
 +        return new ASTORE(slot);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java
@@ -137811,7 +137811,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java
@@ -138114,7 +138114,7 @@
 +        return DUP;     // default
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java
@@ -138198,7 +138198,7 @@
 +        return _error.toString();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java
@@ -138406,7 +138406,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java
@@ -138511,7 +138511,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup
@@ -139632,7 +139632,7 @@
 +        | ID
 +        {: RESULT = parser.getQNameIgnoreDefaultNs("id"); :};
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex
@@ -139897,7 +139897,7 @@
 +({NCName}":")?"@*"       { return newSymbol(sym.QNAME, yytext()); }
 +[ \t\r\n\f]              { /* ignore white space. */ }
 +.                        { throw new Exception(yytext()); }
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java
@@ -140003,7 +140003,7 @@
 +        _source.gotoMark();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java
@@ -141352,7 +141352,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java
@@ -141488,7 +141488,7 @@
 +	}
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java
@@ -141761,7 +141761,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java
@@ -141881,7 +141881,7 @@
 +        _source.gotoMark();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java
@@ -141969,7 +141969,7 @@
 +        _source.gotoMark();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java
@@ -142026,7 +142026,7 @@
 +            return Collator.getInstance(locale);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java
@@ -142068,7 +142068,7 @@
 +    public abstract boolean test(int node, int position, int last, int current,
 +                                 AbstractTranslet translet, DTMAxisIterator iter);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java
@@ -142274,7 +142274,7 @@
 +        return lastPosition;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java
@@ -142747,7 +142747,7 @@
 +        return _dom.getElementsWithIDs();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java
@@ -142781,7 +142781,7 @@
 + * @author Morten Jorgensen
 + */
 +public interface DOMBuilder extends  ExtendedSAX { }
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java
@@ -142918,7 +142918,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java
@@ -143264,7 +143264,7 @@
 +        out.println("</table></center>");
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java
@@ -143428,7 +143428,7 @@
 +        return resetPosition();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java
@@ -143467,7 +143467,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java
@@ -143508,7 +143508,7 @@
 +                                     DeclHandler
 +{
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java
@@ -143545,7 +143545,7 @@
 +public interface Filter {
 +    public boolean test(int node);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java
@@ -143670,7 +143670,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java
@@ -143731,7 +143731,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java
@@ -143845,7 +143845,7 @@
 +        _source.gotoMark();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java
@@ -144751,7 +144751,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java
@@ -145051,7 +145051,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java
@@ -145185,7 +145185,7 @@
 +        _source.gotoMark();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java
@@ -145861,7 +145861,7 @@
 +        return _main.getElementsWithIDs();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java
@@ -146162,7 +146162,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java
@@ -146287,7 +146287,7 @@
 +	}
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java
@@ -146709,7 +146709,7 @@
 +
 +}
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java
@@ -146886,7 +146886,7 @@
 +        return this;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java
@@ -147142,7 +147142,7 @@
 +                                               int last);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java
@@ -147313,7 +147313,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java
@@ -147435,7 +147435,7 @@
 +        _source.gotoMark();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/ObjectFactory.java
@@ -148103,7 +148103,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java
@@ -150015,7 +150015,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SecuritySupport.java
@@ -150147,7 +150147,7 @@
 +        return f.lastModified();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SecuritySupport12.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SecuritySupport12.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SecuritySupport12.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SecuritySupport12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SecuritySupport12.java
@@ -150300,7 +150300,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java
@@ -151325,7 +151325,7 @@
 +    {
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java
@@ -151489,7 +151489,7 @@
 +    }
 +}
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java
@@ -151588,7 +151588,7 @@
 +        _node = _markedNode;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java
@@ -151733,7 +151733,7 @@
 +        return _caseOrders;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java
@@ -151889,7 +151889,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java
@@ -152034,7 +152034,7 @@
 +        //_position = _pos;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java
@@ -152073,7 +152073,7 @@
 +public interface StripWhitespaceFilter {
 +    public boolean stripSpace(DOM dom, int node, int type);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java
@@ -152178,7 +152178,7 @@
 +        return this;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java
@@ -152654,13 +152654,13 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/javax.xml.transform.TransformerFactory b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/javax.xml.transform.TransformerFactory
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/javax.xml.transform.TransformerFactory openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/javax.xml.transform.TransformerFactory
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/javax.xml.transform.TransformerFactory
 @@ -0,0 +1,1 @@
 +com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java
@@ -153421,7 +153421,7 @@
 +        return _domImplementation.createDocument(uri, qname, null);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java
@@ -153491,7 +153491,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
@@ -155091,7 +155091,7 @@
 +
 +    //-- End utility functions
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java
@@ -155149,7 +155149,7 @@
 +    public static final String XMLNS_STRING = "xmlns:";
 +    public static final String XMLNS_URI = "http://www.w3.org/2000/xmlns/";
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java
@@ -155441,7 +155441,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java
@@ -155679,7 +155679,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java
@@ -155917,7 +155917,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
@@ -156155,7 +156155,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java
@@ -156393,7 +156393,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java
@@ -156631,7 +156631,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java
@@ -156869,7 +156869,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java
@@ -157107,7 +157107,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java
@@ -157345,7 +157345,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java
@@ -157583,7 +157583,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
@@ -157821,7 +157821,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java
@@ -158059,7 +158059,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java
@@ -158409,7 +158409,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java
@@ -158447,7 +158447,7 @@
 +        System.err.println(msg);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java
@@ -158492,7 +158492,7 @@
 +        type = t;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ObjectFactory.java
@@ -159160,7 +159160,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java
@@ -159225,7 +159225,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java
@@ -159278,7 +159278,7 @@
 +        _isDefault = isDefault;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/SecuritySupport.java
@@ -159410,7 +159410,7 @@
 +        return f.lastModified();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/SecuritySupport12.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/SecuritySupport12.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/SecuritySupport12.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/SecuritySupport12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/SecuritySupport12.java
@@ -159563,7 +159563,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java
@@ -159695,7 +159695,7 @@
 +	return value;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java
@@ -159736,7 +159736,7 @@
 +    public OutputBuffer append(char[] s, int from, int to);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java
@@ -159796,7 +159796,7 @@
 +        return this;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java
@@ -160065,7 +160065,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java
@@ -160166,7 +160166,7 @@
 +        return this;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java
@@ -160656,7 +160656,7 @@
 +        return retval;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java
@@ -161097,7 +161097,7 @@
 +        return retval;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/ObjectFactory.java
@@ -161765,7 +161765,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java
@@ -161819,7 +161819,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java
@@ -162158,7 +162158,7 @@
 +    }
 +    
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java
@@ -162411,7 +162411,7 @@
 +                }
 +        }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java
@@ -162836,7 +162836,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java
@@ -163143,7 +163143,7 @@
 +        }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SecuritySupport.java
@@ -163275,7 +163275,7 @@
 +        return f.lastModified();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SecuritySupport12.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SecuritySupport12.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SecuritySupport12.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SecuritySupport12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SecuritySupport12.java
@@ -163428,7 +163428,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java
@@ -163887,7 +163887,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java
@@ -164493,7 +164493,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java
@@ -165048,7 +165048,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java
@@ -165387,7 +165387,7 @@
 +        _parser.setDocumentLocator(locator);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
@@ -165819,7 +165819,7 @@
 +        _sdom.set(sdom);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java
@@ -165970,7 +165970,7 @@
 +
 +    public void setErrorListener (ErrorListener handler) { }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
@@ -167402,7 +167402,7 @@
 +        return m_DTMManagerClass;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java
@@ -167894,7 +167894,7 @@
 +       _locator = null;
 +   }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
@@ -169283,7 +169283,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java
@@ -169512,7 +169512,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java
@@ -169659,7 +169659,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java
@@ -169892,7 +169892,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttrImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttrImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttrImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttrImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttrImpl.java
@@ -171136,7 +171136,7 @@
 +
 +
 +} // class AttrImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java
@@ -171492,7 +171492,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttributeMap.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttributeMap.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttributeMap.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttributeMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/AttributeMap.java
@@ -172066,7 +172066,7 @@
 +    } // reconcileDefaults()
 +
 +} // class AttributeMap
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java
@@ -172160,7 +172160,7 @@
 +    }
 +
 +} // class CDATASectionImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java
@@ -172590,7 +172590,7 @@
 +    } // substringData(int,int):String
 +
 +} // class CharacterDataImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ChildNode.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ChildNode.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ChildNode.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ChildNode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ChildNode.java
@@ -172745,7 +172745,7 @@
 +    }
 +
 +} // class ChildNode
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CommentImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CommentImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CommentImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CommentImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CommentImpl.java
@@ -172821,7 +172821,7 @@
 +    }
 +
 +} // class CommentImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java
@@ -173315,7 +173315,7 @@
 +       }
 +
 +} // class DOMImplementationImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java
@@ -176086,7 +176086,7 @@
 +    }
 +
 +} // class CoreDocumentImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java
@@ -177166,7 +177166,7 @@
 +    }
 +
 +} // class XMLParser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java
@@ -177307,7 +177307,7 @@
 +
 +
 +}// class DOMErrorImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java
@@ -177463,7 +177463,7 @@
 +
 +
 +} // class DOMImplementationImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java
@@ -177543,7 +177543,7 @@
 +        return fImplementations.size();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java
@@ -177684,7 +177684,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java
@@ -178080,7 +178080,7 @@
 +    }
 +
 +}// class DOMInputImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java
@@ -178247,7 +178247,7 @@
 +  }
 +
 +}// class DOMLocatorImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java
@@ -178394,7 +178394,7 @@
 +        locale = dlocale;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java
@@ -180446,7 +180446,7 @@
 +
 +
 +}  // DOMNormalizer class
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java
@@ -180624,7 +180624,7 @@
 +    };
 +
 +}//DOMOutputImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java
@@ -180719,7 +180719,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java
@@ -180824,7 +180824,7 @@
 +        return new DOMImplementationListImpl(implementations);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java
@@ -181076,7 +181076,7 @@
 +    } // nextMatchingElementAfter(int):Node
 +
 +} // class DeepNodeListImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java
@@ -181226,7 +181226,7 @@
 +    } // synchronizeChildren()
 +
 +} // class DeferredAttrImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java
@@ -181361,7 +181361,7 @@
 +    } // synchronizeChildren()
 +
 +} // class DeferredAttrImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java
@@ -181475,7 +181475,7 @@
 +    } // synchronizeData()
 +
 +} // class DeferredCDATASectionImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java
@@ -181570,7 +181570,7 @@
 +    } // synchronizeData()
 +
 +} // class DeferredCommentImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java
@@ -181633,7 +181633,7 @@
 +        return singleton;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java
@@ -183784,7 +183784,7 @@
 +    } // class IntVector
 +
 +} // class DeferredDocumentImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java
@@ -183976,7 +183976,7 @@
 +    } // synchronizeChildren()
 +
 +} // class DeferredDocumentTypeImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java
@@ -184107,7 +184107,7 @@
 +    } // synchronizeChildren()
 +
 +} // class DeferredElementDefinitionImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java
@@ -184250,7 +184250,7 @@
 +    } // synchronizeChildren()
 +
 +} // class DeferredElementImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java
@@ -184402,7 +184402,7 @@
 +    } // synchronizeChildren()
 +
 +} // class DeferredElementImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java
@@ -184560,7 +184560,7 @@
 +    } // synchronizeChildren()
 +
 +} // class DeferredEntityImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java
@@ -184720,7 +184720,7 @@
 +    } // synchronizeChildren()
 +
 +} // class DeferredEntityReferenceImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredNode.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredNode.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredNode.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredNode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredNode.java
@@ -184768,7 +184768,7 @@
 +    public int getNodeIndex();
 +
 +} // interface DeferredNode
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java
@@ -184890,7 +184890,7 @@
 +    } // synchronizeData()
 +
 +} // class DeferredNotationImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java
@@ -184989,7 +184989,7 @@
 +    } // synchronizeData()
 +
 +} // class DeferredProcessingInstructionImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java
@@ -185101,7 +185101,7 @@
 +    } // synchronizeData()
 +
 +} // class DeferredTextImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java
@@ -185261,7 +185261,7 @@
 +    }
 +
 +} // class DocumentFragmentImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
@@ -186571,7 +186571,7 @@
 +    }
 +
 +} // class DocumentImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java
@@ -187061,7 +187061,7 @@
 +    }
 +
 +} // class DocumentTypeImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java
@@ -187187,7 +187187,7 @@
 +    } // getAttributes():NamedNodeMap
 +
 +} // class ElementDefinitionImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementImpl.java
@@ -188370,7 +188370,7 @@
 +    } // getDefaultAttributes()
 +
 +} // class ElementImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java
@@ -188863,7 +188863,7 @@
 +        this.type = type;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/EntityImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/EntityImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/EntityImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/EntityImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/EntityImpl.java
@@ -189235,7 +189235,7 @@
 +
 +
 +} // class EntityImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java
@@ -189642,7 +189642,7 @@
 +
 +
 +} // class EntityReferenceImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/LCount.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/LCount.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/LCount.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/LCount.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/LCount.java
@@ -189704,7 +189704,7 @@
 +        return lc;
 +    }
 +} // class LCount
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
@@ -190311,7 +190311,7 @@
 +
 +
 +} // class NamedNodeMapImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeImpl.java
@@ -192340,7 +192340,7 @@
 +    } // writeObject(ObjectOutputStream)
 +
 +} // class NodeImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java
@@ -192719,7 +192719,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeListCache.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeListCache.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeListCache.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeListCache.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeListCache.java
@@ -192784,7 +192784,7 @@
 +    }
 +}
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NotationImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NotationImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NotationImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NotationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NotationImpl.java
@@ -193001,7 +193001,7 @@
 +    }
 +
 +} // class NotationImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ObjectFactory.java
@@ -193561,7 +193561,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java
@@ -193819,7 +193819,7 @@
 +        throw new NotSerializableException(getClass().getName());
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java
@@ -193948,7 +193948,7 @@
 +
 +
 +} // class DOMImplementationImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java
@@ -194103,7 +194103,7 @@
 +    }
 +
 +} // class PSVIDocumentImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java
@@ -194404,7 +194404,7 @@
 +        throw new NotSerializableException(getClass().getName());
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ParentNode.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ParentNode.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ParentNode.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ParentNode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ParentNode.java
@@ -195446,7 +195446,7 @@
 +        }
 +    }
 +} // class ParentNode
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java
@@ -195612,7 +195612,7 @@
 +
 +
 +} // class ProcessingInstructionImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java
@@ -195654,7 +195654,7 @@
 +        super(code,message);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/RangeImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/RangeImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/RangeImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/RangeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/RangeImpl.java
@@ -197744,7 +197744,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/SecuritySupport.java
@@ -197901,7 +197901,7 @@
 +
 +    private SecuritySupport () {}
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/TextImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/TextImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/TextImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/TextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/TextImpl.java
@@ -198571,7 +198571,7 @@
 +    }
 +
 +} // class TextImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java
@@ -199083,7 +199083,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java
@@ -199223,7 +199223,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java
@@ -199340,19 +199340,19 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/org.apache.xerces.dom.DOMImplementationSourceImpl b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/org.apache.xerces.dom.DOMImplementationSourceImpl
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/org.apache.xerces.dom.DOMImplementationSourceImpl openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/org.apache.xerces.dom.DOMImplementationSourceImpl
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/org.apache.xerces.dom.DOMImplementationSourceImpl
 @@ -0,0 +1,1 @@
 +com.sun.org.apache.xerces.internal.dom.DOMImplementationSourceImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/org.w3c.dom.DOMImplementationSourceList b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/org.w3c.dom.DOMImplementationSourceList
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/org.w3c.dom.DOMImplementationSourceList openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/org.w3c.dom.DOMImplementationSourceList
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/org.w3c.dom.DOMImplementationSourceList
 @@ -0,0 +1,1 @@
 +com.sun.org.apache.xerces.internal.dom.DOMXSImplementationSourceImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/Constants.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/Constants.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/Constants.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/Constants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/Constants.java
@@ -200091,7 +200091,7 @@
 +    } // print(String,String,Object[])
 +    
 +} // class Constants
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java
@@ -200162,7 +200162,7 @@
 +        throws XNIException, IOException;
 +
 +} // interface ExternalSubsetResolver
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
@@ -200338,7 +200338,7 @@
 +    }
 +    
 +}//PropertyManager
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java
@@ -200427,7 +200427,7 @@
 +
 +
 +} // interface DOMRevalidationHandler
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/Version.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/Version.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/Version.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/Version.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/Version.java
@@ -200533,7 +200533,7 @@
 +    }
 +
 +} // class Version
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java
@@ -200845,7 +200845,7 @@
 +    } // getVersionNotSupportedKey: String
 +
 +} // class XML11DTDScannerImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java
@@ -201438,7 +201438,7 @@
 +    } // getVersionNotSupportedKey: String
 +
 +} // class XML11DocumentScannerImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
@@ -202969,7 +202969,7 @@
 +    } // skipString(String):boolean
 +
 +} // class XML11EntityScanner
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java
@@ -203900,7 +203900,7 @@
 +        } // reconfigurePipeline()
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java
@@ -204011,7 +204011,7 @@
 +    } // prefixBoundToNullURI(String, String):  boolean
 +
 +} // class XML11NamespaceBinder
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
@@ -206149,7 +206149,7 @@
 +    }
 +    
 +} // class XMLDTDScannerImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
@@ -209395,7 +209395,7 @@
 +    }
 +    
 +} // class XMLDocumentFragmentScannerImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java
@@ -210902,7 +210902,7 @@
 +    }
 +    
 +} // class XMLDocumentScannerImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java
@@ -210957,7 +210957,7 @@
 +    public String getEntityName();
 +
 +} // XMLEntityDescription
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java
@@ -211081,7 +211081,7 @@
 +    public void endEntity(String name, Augmentations augs) throws IOException, XNIException;
 +
 +} // interface XMLEntityHandler
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
@@ -214140,7 +214140,7 @@
 +    }
 +            
 +} // class XMLEntityManager
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
@@ -216287,7 +216287,7 @@
 +
 +
 +} // class XMLEntityScanner
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java
@@ -216900,7 +216900,7 @@
 +        return fSaxProxy;
 +    }
 +} // class XMLErrorReporter
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java
@@ -217542,7 +217542,7 @@
 +    }
 +
 +} // class XMLNSDocumentScannerImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java
@@ -218440,7 +218440,7 @@
 +    } // prefixBoundToNullURI(String, String):  boolean
 +
 +} // class XMLNamespaceBinder
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
@@ -219887,7 +219887,7 @@
 +    
 +    
 +} // class XMLScanner
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java
@@ -220425,7 +220425,7 @@
 +        return fStreamReader.getAttributeLocalName(index);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java
@@ -221798,7 +221798,7 @@
 +    
 +    
 +}//XMLReaderImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java
@@ -222077,7 +222077,7 @@
 +    }
 +
 +} // class XMLVersionDetector
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java
 new file mode 100755
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java
@@ -222371,7 +222371,7 @@
 +
 +} // class BalancedDTDGrammar
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java
@@ -225167,7 +225167,7 @@
 +        return false;
 +    }
 +} // class DTDGrammar
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java
@@ -225324,7 +225324,7 @@
 +        return fActiveGrammar;
 +    }
 +} // class DTDGrammarBucket
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java
@@ -225457,7 +225457,7 @@
 +    } // getScannerVersion() : short
 +
 +} // class XML11DTDProcessor
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java
@@ -225588,7 +225588,7 @@
 +    } // init()
 +
 +} // class XML11DTDValidator
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java
@@ -225859,7 +225859,7 @@
 +
 +    } // endNamespaceScope(QName,boolean)
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java
@@ -225974,7 +225974,7 @@
 +    } // clear
 +
 +} // class XMLAttributeDecl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java
@@ -226315,7 +226315,7 @@
 +    } // interface Provider
 +
 +} // class XMLContentSpec
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java
@@ -226550,7 +226550,7 @@
 +    }
 +} // class XMLDTDDescription
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java
@@ -227113,7 +227113,7 @@
 +    } // getScannerVersion() : short
 +
 +} // class XMLDTDLoader
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java
@@ -228897,7 +228897,7 @@
 +    }
 +
 +} // class XMLDTDProcessor
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java
@@ -231019,7 +231019,7 @@
 +    }
 +
 +} // class XMLDTDValidator
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java
@@ -231117,7 +231117,7 @@
 +
 +
 +} // interface XMLDTDValidatorFilter
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java
@@ -231263,7 +231263,7 @@
 +    } // clear
 +
 +} // class XMLElementDecl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java
@@ -231426,7 +231426,7 @@
 +    } // clear
 +
 +} // class XMLEntityDecl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java
@@ -231706,7 +231706,7 @@
 +    } // endNamespaceScope(QName,boolean)
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java
@@ -231823,7 +231823,7 @@
 +    } // clear
 +
 +} // class XMLNotationDecl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java
@@ -232040,7 +232040,7 @@
 +    } // clear
 +
 +} // class XMLSimpleType
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java
@@ -232237,7 +232237,7 @@
 +    }
 +
 +} // class CMAny
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java
@@ -232433,7 +232433,7 @@
 +    private CMNode  fLeftChild;
 +    private CMNode  fRightChild;
 +};
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java
@@ -232624,7 +232624,7 @@
 +    }
 +
 +} // class CMLeaf
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java
@@ -232819,7 +232819,7 @@
 +    private int         fMaxStates  = -1;
 +    private Object      fUserData   = null;
 +};
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java
@@ -233167,7 +233167,7 @@
 +    }
 +   /* Optimization(Jan, 2001) */
 +};
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java
@@ -233315,7 +233315,7 @@
 +    // -------------------------------------------------------------------
 +    private CMNode  fChild;
 +};
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java
@@ -233408,7 +233408,7 @@
 +    public int validate(QName[] children, int offset, int length);
 +
 +} // interface ContentModelValidator
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java
@@ -234446,7 +234446,7 @@
 +    }
 +
 +} // class DFAContentModel
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java
@@ -234709,7 +234709,7 @@
 +    } // validate
 +
 +} // class MixedContentModel
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java
@@ -235034,7 +235034,7 @@
 +    } // validate
 +
 +} // class SimpleContentModel
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java
@@ -235126,7 +235126,7 @@
 +    public abstract Hashtable getBuiltInTypes();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java
@@ -235173,7 +235173,7 @@
 +        super(msg);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java
@@ -235286,7 +235286,7 @@
 +        return msg;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java
@@ -235336,7 +235336,7 @@
 +        throws InvalidDatatypeValueException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java
@@ -235389,7 +235389,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java
@@ -235482,7 +235482,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ObjectFactory.java
@@ -236042,7 +236042,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java
@@ -236195,7 +236195,7 @@
 +                                                 XSObjectList annotations);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/SecuritySupport.java
@@ -236352,7 +236352,7 @@
 +
 +    private SecuritySupport () {}
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java
@@ -236455,7 +236455,7 @@
 +            return actualValue.toString();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java
@@ -236527,7 +236527,7 @@
 +    public Locale getLocale();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java
@@ -236668,7 +236668,7 @@
 +        minExclusiveAnnotation = null;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java
@@ -236876,7 +236876,7 @@
 +     */
 +    public short getWhitespace() throws DatatypeException;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java
@@ -236962,7 +236962,7 @@
 +    }//createBuiltInTypes()
 +
 +}// DTDDVFactoryImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java
@@ -237035,7 +237035,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java
@@ -237124,7 +237124,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java
@@ -237207,7 +237207,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java
@@ -237280,7 +237280,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java
@@ -237342,7 +237342,7 @@
 +   }
 +
 +} // class NMTOKENDatatypeValidator
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java
@@ -237402,7 +237402,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java
@@ -237467,7 +237467,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java
@@ -237554,7 +237554,7 @@
 +
 +
 +}//XML11DTDDVFactoryImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java
@@ -237645,7 +237645,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java
@@ -237730,7 +237730,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java
@@ -237794,7 +237794,7 @@
 +   }
 +
 +} // class XML11NMTOKENDatatypeValidator
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java
@@ -238106,7 +238106,7 @@
 +        return newSize;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java
@@ -238200,7 +238200,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java
@@ -238320,7 +238320,7 @@
 +        return decodedData;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java
@@ -239336,7 +239336,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java
@@ -239385,7 +239385,7 @@
 +    }
 +
 +} // class AnyAtomicDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java
@@ -239436,7 +239436,7 @@
 +    }
 +
 +} // class AnySimpleDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java
@@ -239612,7 +239612,7 @@
 +    }
 +
 +} // class AnyURIDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java
@@ -239702,7 +239702,7 @@
 +        }
 +    }
 +} // class Base64BinaryDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java
@@ -239956,7 +239956,7 @@
 +    }//createBuiltInTypes(SymbolHash)
 +
 +}//BaseDVFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java
@@ -240016,7 +240016,7 @@
 +    }
 +
 +} // class BooleanDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java
@@ -240113,7 +240113,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java
@@ -240211,7 +240211,7 @@
 +                , date.unNormHour, date.unNormMinute, (int)date.unNormSecond, date.unNormSecond != 0?new BigDecimal(date.unNormSecond - ((int)date.unNormSecond)):null, date.timezoneHr * 60 + date.timezoneMin);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java
@@ -240332,7 +240332,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java
@@ -240399,7 +240399,7 @@
 +                date.second != DatatypeConstants.FIELD_UNDEFINED?new BigDecimal(String.valueOf(sign*date.second)):null);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java
@@ -240767,7 +240767,7 @@
 +        }
 +    }
 +} // class DecimalDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java
@@ -241022,7 +241022,7 @@
 +        }
 +    }
 +} // class DoubleDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java
@@ -241412,7 +241412,7 @@
 +                date.second != DatatypeConstants.FIELD_UNDEFINED?new BigDecimal(String.valueOf(sign*date.second)):null);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java
@@ -241473,7 +241473,7 @@
 +    }
 +
 +} // class EntityDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java
@@ -241713,7 +241713,7 @@
 +        }
 +    }
 +} // class FloatDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java
@@ -241886,7 +241886,7 @@
 +    }//createBuiltInTypes(SymbolHash)
 +
 +}//XFormsDVFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java
@@ -241974,7 +241974,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java
@@ -242034,7 +242034,7 @@
 +        context.addId(content);
 +    }
 +} // class IDDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java
@@ -242092,7 +242092,7 @@
 +    }
 +
 +}//IDREF class
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java
@@ -242141,7 +242141,7 @@
 +    }
 +
 +} // class EntityDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java
@@ -242257,7 +242257,7 @@
 +        }
 +    }
 +} // class ListDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java
@@ -242429,7 +242429,7 @@
 +                , DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED, date.timezoneHr * 60 + date.timezoneMin);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java
@@ -242562,7 +242562,7 @@
 +                , DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED, date.timezoneHr * 60 + date.timezoneMin);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java
@@ -242928,7 +242928,7 @@
 +        return ((XPrecisionDecimal)value1).isIdentical((XPrecisionDecimal)value2);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java
@@ -243044,7 +243044,7 @@
 +        }
 +    }
 +} // class QNameDVDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java
@@ -243429,7 +243429,7 @@
 +    }
 +
 +}//SchemaDVFactoryImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java
@@ -243473,7 +243473,7 @@
 +        super (s);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java
@@ -243524,7 +243524,7 @@
 +    }
 +
 +} // class StringDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java
@@ -243641,7 +243641,7 @@
 +                , DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED, date.unNormHour, date.unNormMinute, (int)date.unNormSecond, date.unNormSecond != 0?new BigDecimal(date.unNormSecond - ((int)date.unNormSecond)):null, date.timezoneHr * 60 + date.timezoneMin);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java
@@ -243756,7 +243756,7 @@
 +    }
 +
 +} // interface TypeValidator
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java
@@ -243808,7 +243808,7 @@
 +    }
 +
 +} // class UnionDV
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java
@@ -247087,7 +247087,7 @@
 +	
 +} // class XSSimpleTypeDecl
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java
@@ -247207,7 +247207,7 @@
 +                , DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED, date.timezoneHr * 60 + date.timezoneMin);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java
@@ -247310,7 +247310,7 @@
 +                , DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED, date.timezoneHr * 60 + date.timezoneMin);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java
@@ -247378,7 +247378,7 @@
 +                null);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java
@@ -247630,7 +247630,7 @@
 +     } // close()
 +
 +} // class ASCIIReader
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java
@@ -247774,7 +247774,7 @@
 +     } // getMessage()
 +
 +} // MalformedByteSequenceException
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java
@@ -248090,7 +248090,7 @@
 +     } // close()
 +
 +} // class UCSReader
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java
@@ -248801,7 +248801,7 @@
 +    } // invalidSurrogate(int)
 +
 +} // class UTF8Reader
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties
@@ -248875,7 +248875,7 @@
 +jaxp-schema-support=Both the setSchema method and the schemaLanguage property is used
 +
 +jaxp_feature_not_supported=Feature "{0}" is not supported.
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties
@@ -248909,7 +248909,7 @@
 +AllFieldsNull=All the fields (javax.xml.datatype.DatatypeConstants.Field) are null.
 +
 +TooLarge={0} value "{1}" too large to be supported by this implementation
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties
@@ -248943,7 +248943,7 @@
 +ProperyNameNull = The property name cannot be null.
 +SAXSourceNullInputSource = The SAXSource specified contains no InputSource.
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties
@@ -248985,7 +248985,7 @@
 +errorHandlerDebugMsg=Error\: URI \= "{0}", Line \= "{1}", \: {2} 
 +null
 +null
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties
@@ -249026,7 +249026,7 @@
 +# Messages from erroneous set-up
 +IncompatibleNamespaceContext = The type of the NamespaceContext is incompatible with using XInclude; it must be an instance of XIncludeNamespaceSupport
 +ExpandedSystemId = Could not expand system id of included resource
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java
@@ -249152,7 +249152,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
@@ -249452,7 +249452,7 @@
 +
 +# Application can set the limit of number of attributes of entity that should be expanded by the parser.
 +ElementAttributeLimit= Element \"{0}\" has more than \"{1}\" attributes, \"{1}\" is the limit imposed by the application.
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties
@@ -249745,7 +249745,7 @@
 +        UndeclaredEntity = UndeclaredEntity: Entity ''{0}'' is not declared.
 +        UndeclaredPrefix = UndeclaredPrefix: Cannot resolve ''{0}'' as a QName: the prefix ''{1}'' is not declared.
 +null
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties
@@ -249782,7 +249782,7 @@
 +    no-output-specified = no-output-specified: The output destination for data to be written to was null.
 +    unsupported-encoding = unsupported-encoding: An unsupported encoding is encountered.
 +    unable-to-serialize-node = unable-to-serialize-node: The node could not be serialized.
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties
@@ -249814,7 +249814,7 @@
 +InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: The element() Scheme contains a ShortHand Pointer ''{0}'' with an invalid NCName.
 +InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: The element() Scheme contains an invalid child sequence character ''{0}''. 
 \ No newline at end of file
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java
@@ -249868,7 +249868,7 @@
 +     */
 +    public boolean isEntityUnparsed (String name);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java
@@ -249958,7 +249958,7 @@
 +        fCachedDTD = false;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java
@@ -250169,7 +250169,7 @@
 +        return fLocale;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java
@@ -252194,7 +252194,7 @@
 +    } // main(String[])
 +
 +} // class XPath
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java
@@ -252260,7 +252260,7 @@
 +    } // getKey():  String
 +
 +} // class XPathException
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java
@@ -252502,7 +252502,7 @@
 +        }
 +    }*/
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java
 new file mode 100755
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java
@@ -252684,7 +252684,7 @@
 +    }
 +}
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java
@@ -252875,7 +252875,7 @@
 +        return ret;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java
@@ -253134,7 +253134,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java
@@ -253194,7 +253194,7 @@
 +        return this.location;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java
@@ -253701,7 +253701,7 @@
 +        +"\u0B66\u0B6F\u0BE7\u0BEF\u0C66\u0C6F\u0CE6\u0CEF\u0D66\u0D6F\u0E50\u0E59\u0ED0\u0ED9"
 +        +"\u0F20\u0F29";
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java
@@ -254041,7 +254041,7 @@
 +        System.out.println();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java
@@ -254669,7 +254669,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java
@@ -255906,7 +255906,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
@@ -258357,7 +258357,7 @@
 +        return Character.toLowerCase(uch1) == Character.toLowerCase(uch2);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java
@@ -259895,7 +259895,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties
@@ -259939,7 +259939,7 @@
 +parser.quantifier.3=Invalid quantifier. A digit or '}' is expected.
 +parser.quantifier.4=Invalid quantifier. A min quantity must be <= a max quantity.
 +parser.quantifier.5=Invalid quantifier. A quantity value overflow.
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties
@@ -259976,7 +259976,7 @@
 +parser.descape.4=Point de code Unicode invalide.
 +parser.descape.5=Ancre interdite ici.
 +parser.process.1=Cette expression n'est pas autoris\u00e9e compte tenu des options en cours.
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
@@ -260013,7 +260013,7 @@
 +parser.descape.4=Unicode \u306e\u30b3\u30fc\u30c9\u30dd\u30a4\u30f3\u30c8\u3068\u3057\u3066\u4e0d\u6b63\u3067\u3059.
 +parser.descape.5=\u30a2\u30f3\u30ab\u30fc\u3092\u3053\u3053\u306b\u66f8\u304f\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093.
 +parser.process.1=\u3053\u306e\u8868\u73fe\u306f\u73fe\u5728\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u8a2d\u5b9a\u3067\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093.
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java
@@ -260240,7 +260240,7 @@
 +        fValidationContext = null;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java
@@ -260522,7 +260522,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java
@@ -261731,7 +261731,7 @@
 +    }
 +
 +} // class SchemaGrammar
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java
@@ -261848,7 +261848,7 @@
 +        }
 +    } // makeGlobal
 +} // class NamespaceSupport
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java
@@ -262070,7 +262070,7 @@
 +    public static final int OCCURRENCE_UNBOUNDED = -1;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java
@@ -262403,7 +262403,7 @@
 +        short bMethod;
 +    }
 +} // class SubstitutionGroupHandler
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java
@@ -262461,7 +262461,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
@@ -263803,7 +263803,7 @@
 +    
 +} // XMLGrammarLoader
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java
@@ -268060,7 +268060,7 @@
 +    }
 +    
 +} // class SchemaValidator
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java
@@ -268233,7 +268233,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java
@@ -268427,7 +268427,7 @@
 +    }
 +
 +} // class XSAttributeDecl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java
@@ -268795,7 +268795,7 @@
 +        }
 +
 +} // class XSAttributeGroupDecl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java
@@ -268941,7 +268941,7 @@
 +    }
 +
 +} // class XSAttributeUseImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java
@@ -269647,7 +269647,7 @@
 +    }
 +
 +} // class XSComplexTypeDecl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java
@@ -271099,7 +271099,7 @@
 +    }
 +
 +} // class XSContraints
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java
@@ -271366,7 +271366,7 @@
 +    }
 +
 +} // XSDDescription
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java
@@ -271682,7 +271682,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java
@@ -272056,7 +272056,7 @@
 +    }
 +
 +} // class XSElementDecl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java
@@ -272228,7 +272228,7 @@
 +    }
 +
 +} // class XSGrammarBucket
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java
@@ -272323,7 +272323,7 @@
 +        }
 +
 +} // class XSGroupDecl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java
@@ -272447,7 +272447,7 @@
 +    }
 +
 +} // class XSImplementationImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java
@@ -272780,7 +272780,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java
@@ -272879,7 +272879,7 @@
 +        return msg;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java
@@ -273118,7 +273118,7 @@
 +    }
 +
 +} // class XSModelGroupImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java
@@ -273606,7 +273606,7 @@
 +    }
 +
 +} // class XSModelImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java
@@ -273714,7 +273714,7 @@
 +        }
 +
 +} // class XSNotationDecl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java
@@ -273953,7 +273953,7 @@
 +        }
 +
 +} // class XSParticle
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java
@@ -274549,7 +274549,7 @@
 +        }
 +
 +} // class XSWildcardDecl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java
@@ -274801,7 +274801,7 @@
 +    } // class Matcher
 +
 +} // class Field
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java
@@ -274894,7 +274894,7 @@
 +    public void endValueScopeFor(IdentityConstraint identityConstraint, int initialDepth);
 +
 +} // interface FieldActivator
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java
@@ -275149,7 +275149,7 @@
 +    }
 +
 +} // class IdentityConstraint
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java
@@ -275226,7 +275226,7 @@
 +    }
 +
 +} // class KeyRef
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java
@@ -275485,7 +275485,7 @@
 +    } // class Matcher
 +
 +} // class Selector
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java
@@ -275541,7 +275541,7 @@
 +    //
 +
 +} // class Unique
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java
@@ -275616,7 +275616,7 @@
 +
 +
 +} // interface ValueStore
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java
@@ -276143,7 +276143,7 @@
 +    /***/
 +
 +} // class XPathMatcher
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java
@@ -276598,7 +276598,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java
@@ -276771,7 +276771,7 @@
 +    } // setProperty(String,Object)
 +
 +}//CMNodeFactory()
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java
@@ -277001,7 +277001,7 @@
 +
 +} // class XSAllCM
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java
@@ -277147,7 +277147,7 @@
 +    private CMNode  fLeftChild;
 +    private CMNode  fRightChild;
 +} // XSCMBinOp
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java
@@ -277287,7 +277287,7 @@
 +    }
 +
 +} // class XSCMLeaf
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java
 new file mode 100755
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java
@@ -277344,7 +277344,7 @@
 +    }
 +}
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java
@@ -277462,7 +277462,7 @@
 +    private CMNode  fChild;
 +} // XSCMUniOp
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java
@@ -277578,7 +277578,7 @@
 +    public ArrayList checkMinMaxBounds();
 +    
 +} // XSCMValidator
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java
@@ -278825,7 +278825,7 @@
 +    }
 +
 +} // class DFAContentModel
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java
@@ -278971,7 +278971,7 @@
 +    }
 +
 +} // class XSEmptyCM
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java
@@ -279120,7 +279120,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java
@@ -279416,7 +279416,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java
@@ -279572,7 +279572,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java
@@ -279795,7 +279795,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java
@@ -280038,7 +280038,7 @@
 +        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Method not supported");
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java
@@ -280914,7 +280914,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java
@@ -281174,7 +281174,7 @@
 +        return fSyntheticAnnotation;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java
@@ -281267,7 +281267,7 @@
 +                throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Method not supported");
 +        }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java
@@ -281359,7 +281359,7 @@
 +        return hidden;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java
@@ -281816,7 +281816,7 @@
 +        return newVal.toString();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java
@@ -282420,7 +282420,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java
@@ -283456,7 +283456,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java
@@ -283591,7 +283591,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java
@@ -283978,7 +283978,7 @@
 +    }
 +
 +} // SchemaContentHandler
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java
@@ -284055,7 +284055,7 @@
 +        }
 +    }
 +} // XSAnnotationInfo
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
@@ -285956,7 +285956,7 @@
 +        return ret;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java
@@ -286146,7 +286146,7 @@
 +
 +    } // traverseIdentityConstraint(IdentityConstraint,Element, XSDocumentInfo)
 +} // XSDAbstractIDConstraintTraverser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java
@@ -286518,7 +286518,7 @@
 +    // the big particle array to hold all particles in model groups
 +    ParticleArray fPArray = new ParticleArray();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java
@@ -287336,7 +287336,7 @@
 +        return newVal.toString();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java
@@ -287512,7 +287512,7 @@
 +    } // traverseGlobal
 +
 +} // XSDAttributeGroupTraverser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java
@@ -287931,7 +287931,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java
@@ -289159,7 +289159,7 @@
 +        fAnnotations[fAnnotations.length-1] = annotation;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java
@@ -289671,7 +289671,7 @@
 +    } // reset()
 +    
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java
@@ -289891,7 +289891,7 @@
 +
 +    } // traverseGlobal
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
@@ -292625,7 +292625,7 @@
 +    }
 +    
 +} // XSDHandler
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java
@@ -292734,7 +292734,7 @@
 +        fAttrChecker.returnAttrArray(attrValues, schemaDoc);
 +    } // traverse(Element,int,XSDocumentInfo, SchemaGrammar)
 +} // XSDKeyrefTraverser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java
@@ -292844,7 +292844,7 @@
 +        return notation;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java
@@ -293347,7 +293347,7 @@
 +    }
 +
 +}//class XSDSimpleTypeTraverser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java
@@ -293434,7 +293434,7 @@
 +        fAttrChecker.returnAttrArray(attrValues, schemaDoc);
 +    } // traverse(Element,XSDElementDecl,XSDocumentInfo, SchemaGrammar)
 +} // XSDUniqueOrKeyTraverser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java
@@ -293630,7 +293630,7 @@
 +    } // traverseWildcardDecl
 +
 +} // XSDWildcardTraverser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java
@@ -293887,7 +293887,7 @@
 +    }
 +    
 +} // XSDocumentInfo
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/NSItemListImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/NSItemListImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/NSItemListImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/NSItemListImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/NSItemListImpl.java
@@ -293971,7 +293971,7 @@
 +    }
 +
 +} // class XSParticle
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java
@@ -294076,7 +294076,7 @@
 +    }
 +
 +} // class XSParticle
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java
@@ -294228,7 +294228,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java
@@ -294352,7 +294352,7 @@
 +    }
 +
 +} // class XSParticle
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java
@@ -294409,7 +294409,7 @@
 +        return Integer.toString(fValue);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java
@@ -294457,7 +294457,7 @@
 +            return new XInt(value);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java
@@ -294525,7 +294525,7 @@
 +
 +
 +} // class XSGrammarPool
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java
@@ -294671,7 +294671,7 @@
 +    }
 +
 +} // class XSNamedMapImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java
@@ -294863,7 +294863,7 @@
 +    }
 +
 +} // class XSNamedMapImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java
@@ -294985,7 +294985,7 @@
 +    }
 +
 +} // class XSObjectList
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java
@@ -295048,7 +295048,7 @@
 +        errorCount++;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
@@ -295274,7 +295274,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
@@ -295639,7 +295639,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java
@@ -295685,7 +295685,7 @@
 +    static final String JAXP_SCHEMA_SOURCE =
 +        "http://java.sun.com/xml/jaxp/properties/schemaSource";
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java
@@ -296289,7 +296289,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java
@@ -296507,7 +296507,7 @@
 +    }
 +
 + }
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
@@ -297127,7 +297127,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java
@@ -297286,7 +297286,7 @@
 +        return fParentComponentManager.getProperty(propertyId);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java
@@ -297467,7 +297467,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java
@@ -297727,7 +297727,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java
@@ -298384,7 +298384,7 @@
 +		);
 +	}
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java
 new file mode 100755
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java
@@ -298593,7 +298593,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java
@@ -300619,7 +300619,7 @@
 +    }
 +}
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java
 new file mode 100755
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java
@@ -300825,7 +300825,7 @@
 +    }
 +}
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
@@ -303887,25 +303887,25 @@
 +    }
 +}
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/javax.xml.datatype.DatatypeFactory b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/javax.xml.datatype.DatatypeFactory
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/javax.xml.datatype.DatatypeFactory openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/javax.xml.datatype.DatatypeFactory
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/datatype/javax.xml.datatype.DatatypeFactory
 @@ -0,0 +1,1 @@
 +com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.DocumentBuilderFactory b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.DocumentBuilderFactory
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.DocumentBuilderFactory openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.DocumentBuilderFactory
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.DocumentBuilderFactory
 @@ -0,0 +1,1 @@
 +com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.SAXParserFactory b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.SAXParserFactory
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.SAXParserFactory openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.SAXParserFactory
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.SAXParserFactory
 @@ -0,0 +1,1 @@
 +com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java
@@ -303996,7 +303996,7 @@
 +    }
 +
 +} // AbstractXMLSchema
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java
@@ -304090,7 +304090,7 @@
 +
 +    public void setIgnoringCharacters(boolean ignore);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java
@@ -304353,7 +304353,7 @@
 +    }
 +
 +} // DOMResultAugmentor
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java
@@ -304731,7 +304731,7 @@
 +    }
 +
 +} // DOMResultBuilder
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java
@@ -305347,7 +305347,7 @@
 +    }
 +    
 +} // DOMValidatorHelper
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java
@@ -305414,7 +305414,7 @@
 +    }
 +
 +} // DraconianErrorHandler
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java
@@ -305491,7 +305491,7 @@
 +    }
 +
 +} // EmptyXMLSchema
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java
@@ -305618,7 +305618,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java
@@ -305724,7 +305724,7 @@
 +        return msg;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java
@@ -305794,7 +305794,7 @@
 +    }
 +
 +} // ReadOnlyGrammarPool
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java
@@ -305880,7 +305880,7 @@
 +    }
 +
 +} // SimpleXMLSchema
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java
@@ -306320,7 +306320,7 @@
 +    } // class SoftGrammarReference
 +
 +} // class SoftReferenceGrammarPool
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java
@@ -306425,7 +306425,7 @@
 +                new Object [] {source.getClass().getName(), result.getClass().getName()}));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java
@@ -306613,7 +306613,7 @@
 +    }
 +
 +} // StreamValidatorHelper
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java
@@ -306695,7 +306695,7 @@
 +    }
 +
 +} // Util
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java
@@ -307769,7 +307769,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java
@@ -307814,7 +307814,7 @@
 +    public void validate(Source source, Result result)
 +        throws SAXException, IOException;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java
@@ -308100,7 +308100,7 @@
 +    }
 +    
 +} // ValidatorImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java
@@ -308167,7 +308167,7 @@
 +    }
 +
 +} // WeakReferenceXMLSchema
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java
@@ -308259,7 +308259,7 @@
 +        this.exception = e;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java
@@ -308330,7 +308330,7 @@
 +    }
 +
 +} // XMLSchema
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
@@ -308796,7 +308796,7 @@
 +    } // XMLSchemaFactory.XMLGrammarPoolWrapper
 +    
 +} // XMLSchemaFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
@@ -309328,7 +309328,7 @@
 +    
 +} // XMLSchemaValidatorComponentManager
 + 
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java
@@ -309390,13 +309390,13 @@
 +    public Boolean getFeature(String featureId);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/javax.xml.validation.SchemaFactory b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/javax.xml.validation.SchemaFactory
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/javax.xml.validation.SchemaFactory openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/javax.xml.validation.SchemaFactory
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/validation/javax.xml.validation.SchemaFactory
 @@ -0,0 +1,1 @@
 +com.sun.org.apache.xerces.internal.jaxp.validation.XMLSchemaFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java
@@ -311978,7 +311978,7 @@
 +
 +
 +} // class AbstractDOMParser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java
@@ -314401,7 +314401,7 @@
 +    }
 +
 +} // class AbstractSAXParser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java
@@ -315218,7 +315218,7 @@
 +    } // reset()
 +
 +} // class AbstractXMLDocumentParser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java
@@ -315812,7 +315812,7 @@
 +
 +
 +} // class BasicParserConfiguration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java
@@ -316247,7 +316247,7 @@
 +    } // class ShadowedGrammarPool
 +
 +} // class CachingParserPool
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
@@ -316861,7 +316861,7 @@
 +    } // getXMLParserConfiguration():XMLParserConfiguration
 +
 +} // class DOMParser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java
@@ -318177,7 +318177,7 @@
 +    }
 +
 +} // class DOMParserImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
@@ -319054,7 +319054,7 @@
 +    }
 +
 +} // class DTDConfiguration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DTDParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DTDParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DTDParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DTDParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/DTDParser.java
@@ -319540,7 +319540,7 @@
 +    } // endContentModel
 +
 +} // class DTDParser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java
@@ -319796,7 +319796,7 @@
 +    } // createDTDValidator():XMLDTDValidator
 +
 +} // class IntegratedParserConfiguration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
@@ -320596,7 +320596,7 @@
 +    }
 +
 +} // class NonValidatingConfiguration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/ObjectFactory.java
@@ -321154,7 +321154,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
@@ -321285,7 +321285,7 @@
 +    } // <init>(SymbolTable,XMLGrammarPool)
 +
 +} // class SAXParser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java
@@ -321403,7 +321403,7 @@
 +    } // <init>(SymbolTable,XMLGrammarPool)
 +
 +} // class SecurityConfiguration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/SecuritySupport.java
@@ -321560,7 +321560,7 @@
 +
 +    private SecuritySupport () {}
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java
@@ -321929,7 +321929,7 @@
 +    } // checkProperty(String)
 +
 +} // class StandardParserConfiguration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java
@@ -322229,7 +322229,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java
@@ -322455,7 +322455,7 @@
 +        super.setProperty(propertyId, value);
 +    } // setProperty(String,Object)
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java
@@ -322490,7 +322490,7 @@
 + *
 + */
 +public interface XML11Configurable {}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java
@@ -324040,7 +324040,7 @@
 +    }
 +
 +} // class XML11Configuration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java
@@ -325385,7 +325385,7 @@
 +    }
 +
 +} // class XML11DTDConfiguration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java
@@ -326625,7 +326625,7 @@
 +    }
 +
 +} // class XML11NonValidatingConfiguration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java
@@ -326717,7 +326717,7 @@
 +    }
 +
 +} // class XMLDocumentParser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java
@@ -327073,7 +327073,7 @@
 +
 +
 +} // class XMLGrammarCachingConfiguration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java
@@ -327135,7 +327135,7 @@
 +    }
 +
 +} // class XMLGrammarParser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java
@@ -327481,7 +327481,7 @@
 +        return gl.getProperty(propertyId);
 +    } // getProperty(String, String):  Object
 +} // class XMLGrammarPreparser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
@@ -327623,7 +327623,7 @@
 +    } // reset()
 +
 +} // class XMLParser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java
@@ -327871,32 +327871,32 @@
 +        super.setProperty(propertyId, value);
 +    } // setProperty(String,Object)
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.DTDConfiguration b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.DTDConfiguration
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.DTDConfiguration openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.DTDConfiguration
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.DTDConfiguration
 @@ -0,0 +1,1 @@
 +com.sun.org.apache.xerces.internal.parsers.DTDConfiguration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XML11Configuration b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XML11Configuration
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XML11Configuration openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XML11Configuration
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XML11Configuration
 @@ -0,0 +1,1 @@
 +com.sun.org.apache.xerces.internal.parsers.XML11Configuration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration
 @@ -0,0 +1,1 @@
 +com.sun.org.apache.xerces.internal.parsers.XIncludeAwareParserConfiguration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.xml.sax.driver b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.xml.sax.driver
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.xml.sax.driver openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.xml.sax.driver
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/org.xml.sax.driver
 @@ -0,0 +1,2 @@
 +com.sun.org.apache.xerces.internal.parsers.SAXParser
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/AttributesProxy.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/AttributesProxy.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/AttributesProxy.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/AttributesProxy.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/AttributesProxy.java
@@ -328093,7 +328093,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java
@@ -328387,7 +328387,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java
@@ -328562,7 +328562,7 @@
 +    } // getType(XMLResourceIdentifier):String
 +
 +} // DOMEntityResolverWrapper
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java
@@ -328987,7 +328987,7 @@
 +    }
 +
 +} // class DOMErrorHandlerWrapper
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMInputSource.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMInputSource.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMInputSource.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMInputSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMInputSource.java
@@ -329068,7 +329068,7 @@
 +    }
 +
 +} // DOMInputSource
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMUtil.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMUtil.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMUtil.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMUtil.java
@@ -329907,7 +329907,7 @@
 +        return null;
 +    }
 +} // class XUtil
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java
@@ -330015,7 +330015,7 @@
 +        return msg;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java
@@ -330136,7 +330136,7 @@
 +    } // printError(String,SAXParseException)
 +
 +} // class DefaultErrorHandler
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java
@@ -330231,7 +330231,7 @@
 +        ; // noop
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java
@@ -331266,7 +331266,7 @@
 +    } // removeJava2IANAMapping
 +
 +} // class EncodingMap
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java
@@ -331486,7 +331486,7 @@
 +    } // createXMLInputSource(InputSource,String):XMLInputSource
 +
 +} // class EntityResolver2Wrapper
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java
@@ -331632,7 +331632,7 @@
 +
 +    } // resolveEntity(String,String,String):XMLInputSource
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java
@@ -331717,7 +331717,7 @@
 +
 +    protected abstract XMLErrorHandler getErrorHandler();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java
@@ -331954,7 +331954,7 @@
 +        return new XNIException(exception.getMessage(),exception);
 +    } // createXNIException(SAXException):XMLParseException
 +} // class ErrorHandlerWrapper
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java
@@ -332154,7 +332154,7 @@
 +    } // setHTTPRequestProperty(String,String)
 +
 +} // class HTTPInputSource
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/IntStack.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/IntStack.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/IntStack.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/IntStack.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/IntStack.java
@@ -332275,7 +332275,7 @@
 +    }
 +
 +} // class IntStack
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/LocatorProxy.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/LocatorProxy.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/LocatorProxy.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/LocatorProxy.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/LocatorProxy.java
@@ -332368,7 +332368,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java
@@ -332483,7 +332483,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/MessageFormatter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/MessageFormatter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/MessageFormatter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/MessageFormatter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/MessageFormatter.java
@@ -332548,7 +332548,7 @@
 +        throws MissingResourceException;
 +
 +} // interface MessageFormatter
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java
@@ -332643,7 +332643,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java
@@ -333132,7 +333132,7 @@
 +    }
 +
 +} // class NamespaceSupport
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java
@@ -333427,7 +333427,7 @@
 +    } // checkProperty(String)
 +
 +} // class ParserConfigurationSettings
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAX2XNI.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAX2XNI.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAX2XNI.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAX2XNI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAX2XNI.java
@@ -333688,7 +333688,7 @@
 +        return xa;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXInputSource.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXInputSource.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXInputSource.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXInputSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXInputSource.java
@@ -333857,7 +333857,7 @@
 +    } // setEncoding(String)
 +
 +} // SAXInputSource
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java
@@ -333973,7 +333973,7 @@
 +    }
 +
 +} // SAXLocatorWrapper
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java
@@ -334079,7 +334079,7 @@
 +        return msg;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java
@@ -334300,7 +334300,7 @@
 +        }
 +
 +} // class SecurityManager
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java
@@ -334426,7 +334426,7 @@
 +    } // hash(char[],int,int):int
 +
 +} // class ShadowedSymbolTable
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SymbolHash.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SymbolHash.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SymbolHash.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SymbolHash.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SymbolHash.java
@@ -334640,7 +334640,7 @@
 +    } // entry
 +
 +} // class SymbolHash
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java
@@ -334965,7 +334965,7 @@
 +    } // class Entry
 +
 +} // class SymbolTable
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java
@@ -335099,7 +335099,7 @@
 +    } // containsSymbol(char[],int,int):boolean
 +
 +} // class SynchronizedSymbolTable
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java
@@ -335321,7 +335321,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java
@@ -335460,7 +335460,7 @@
 +            dtdCache.put(typeNames[i],new TypeInfoImpl(dtdNamespaceURI,typeNames[i]));
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/URI.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/URI.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/URI.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/URI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/URI.java
@@ -337655,7 +337655,7 @@
 +    return true;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XML11Char.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XML11Char.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XML11Char.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XML11Char.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XML11Char.java
@@ -338072,7 +338072,7 @@
 +    } // isXML11ValidName(String):boolean
 +
 +} // class XML11Char
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java
@@ -339269,7 +339269,7 @@
 +    } // class Attribute
 +
 +} // class XMLAttributesImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java
@@ -339376,7 +339376,7 @@
 +     */
 +
 +} //XMLAttributesIteratorImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java
@@ -339967,7 +339967,7 @@
 +        catalog.addReader("application/xml", saxReader);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLChar.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLChar.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLChar.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLChar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLChar.java
@@ -340997,7 +340997,7 @@
 +
 +
 +} // class XMLChar
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java
@@ -341184,7 +341184,7 @@
 +        next.xmlDecl(version, encoding, standalone, augs);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java
@@ -341370,7 +341370,7 @@
 +    } // toString():String
 +
 +} // XMLEntityDescriptionImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java
@@ -341459,7 +341459,7 @@
 +        return fDomain.hashCode() + fKey.hashCode();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java
@@ -341830,7 +341830,7 @@
 +    */
 +
 +} // class XMLGrammarPoolImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java
@@ -341942,7 +341942,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java
@@ -342177,7 +342177,7 @@
 +    } // toString():String
 +
 +} // class XMLResourceIdentifierImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java
@@ -342412,7 +342412,7 @@
 +
 +
 +} // class XMLStringBuffer
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLSymbols.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLSymbols.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLSymbols.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLSymbols.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLSymbols.java
@@ -342520,7 +342520,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java
@@ -342721,7 +342721,7 @@
 +        popContext();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/ObjectFactory.java
@@ -343279,7 +343279,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java
@@ -343436,7 +343436,7 @@
 +
 +    private SecuritySupport () {}
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java
@@ -343503,7 +343503,7 @@
 +        return XML11Char.isXML11Valid(ch);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
@@ -346528,7 +346528,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java
@@ -346622,7 +346622,7 @@
 +        return msg;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java
@@ -346722,7 +346722,7 @@
 +        return getURI(prefix, lastValidContext);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java
@@ -347243,7 +347243,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java
@@ -348011,7 +348011,7 @@
 +
 +
 +} // class XPointerElementhandler
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java
@@ -348225,7 +348225,7 @@
 +    }
 +
 +}//XPointerFramwork
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java
@@ -348275,7 +348275,7 @@
 +    public void reset();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/Augmentations.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/Augmentations.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/Augmentations.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/Augmentations.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/Augmentations.java
@@ -348369,7 +348369,7 @@
 +    public void removeAllItems ();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java
@@ -348553,7 +348553,7 @@
 +
 +
 +} // interface NamespaceContext
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/QName.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/QName.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/QName.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/QName.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/QName.java
@@ -348801,7 +348801,7 @@
 +    } // toString():String
 +
 +} // class QName
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java
@@ -349245,7 +349245,7 @@
 +
 +
 +} // interface XMLAttributes
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java
@@ -349523,7 +349523,7 @@
 +    public XMLDTDContentModelSource getDTDContentModelSource();
 +
 +} // interface XMLDTDContentModelHandler
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java
@@ -349906,7 +349906,7 @@
 +    public XMLDTDSource getDTDSource();
 +
 +} // interface XMLDTDHandler
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java
@@ -350170,7 +350170,7 @@
 +        throws XNIException;
 +
 +} // interface XMLDocumentFragmentHandler
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java
@@ -350471,7 +350471,7 @@
 +    public XMLDocumentSource getDocumentSource();
 +
 +} // interface XMLDocumentHandler
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLLocator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLLocator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLLocator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLLocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLLocator.java
@@ -350555,7 +350555,7 @@
 +
 +
 +} // interface XMLLocator
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java
@@ -350624,7 +350624,7 @@
 +    public String getNamespace();
 +
 +} // XMLResourceIdentifier
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLString.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLString.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLString.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLString.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XMLString.java
@@ -350820,7 +350820,7 @@
 +    } // toString():String
 +
 +} // class XMLString
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XNIException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XNIException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XNIException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XNIException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/XNIException.java
@@ -350917,7 +350917,7 @@
 +    } // getException():Exception
 +
 +} // class QName
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java
@@ -350977,7 +350977,7 @@
 +     */
 +    public XMLGrammarDescription getGrammarDescription ();
 +} // interface Grammar
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java
@@ -351019,7 +351019,7 @@
 +    public String getRootName();
 +
 +} // interface XMLDTDDescription
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java
@@ -351083,7 +351083,7 @@
 +    public String getGrammarType();
 +
 +} // interface XMLGrammarDescription
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java
@@ -351235,7 +351235,7 @@
 +    public Grammar loadGrammar(XMLInputSource source)
 +        throws IOException, XNIException;
 +} // XMLGrammarLoader
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java
@@ -351345,7 +351345,7 @@
 +     */
 +    public void clear();
 +} // XMLGrammarPool
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java
@@ -351488,7 +351488,7 @@
 +    public XMLAttributes getAttributes();
 +
 +} // XSDDescription
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java
@@ -351548,7 +351548,7 @@
 +    public XSModel toXSModel(XSGrammar[] grammars);
 +
 +} // interface XSGrammar
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java
@@ -351679,7 +351679,7 @@
 +    public Object getPropertyDefault(String propertyId);
 +
 +} // interface XMLComponent
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java
@@ -351747,7 +351747,7 @@
 +        throws XMLConfigurationException;
 +
 +} // interface XMLComponentManager
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java
@@ -351872,7 +351872,7 @@
 +    } // getIdentifier():String
 +
 +} // class XMLConfigurationException
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java
@@ -351912,7 +351912,7 @@
 +    extends XMLDTDContentModelHandler, XMLDTDContentModelSource {
 +
 +} // interface XMLDTDContentModelFilter
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java
@@ -352007,7 +352007,7 @@
 +    public XMLDTDContentModelHandler getDTDContentModelHandler( );
 +
 +} // interface XMLDTDContentModelSource
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java
@@ -352047,7 +352047,7 @@
 +    extends XMLDTDHandler, XMLDTDSource {
 +
 +} // interface XMLDTDFilter
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java
@@ -352150,7 +352150,7 @@
 +        throws IOException, XNIException;
 +
 +} // interface XMLDTDScanner
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java
@@ -352204,7 +352204,7 @@
 +    public XMLDTDHandler getDTDHandler();
 +
 +} // interface XMLDTDSource
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java
@@ -352245,7 +352245,7 @@
 +
 +
 +} // interface XMLDocumentFilter
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java
@@ -352325,7 +352325,7 @@
 +
 +    public int next() throws XNIException, IOException;
 +} // interface XMLDocumentScanner
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java
@@ -352379,7 +352379,7 @@
 +    public XMLDocumentHandler getDocumentHandler();
 +
 +} // interface XMLDocumentSource
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java
@@ -352445,7 +352445,7 @@
 +        throws XNIException, IOException;
 +
 +} // interface XMLEntityResolver
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java
@@ -352556,7 +352556,7 @@
 +                           XMLParseException exception) throws XNIException;
 +
 +} // interface XMLErrorHandler
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java
@@ -352815,7 +352815,7 @@
 +    } // getEncoding():String
 +
 +} // class XMLInputSource
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java
@@ -353001,7 +353001,7 @@
 +    } // toString():String
 +
 +} // XMLParseException
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java
@@ -353259,7 +353259,7 @@
 +    public Locale getLocale();
 +
 +} // interface XMLParserConfiguration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java
@@ -353361,7 +353361,7 @@
 +    public void cleanup();
 +
 +} // interface XMLPullParserConfiguration
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java
@@ -354245,7 +354245,7 @@
 +    } // class Scanner
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java
@@ -354546,7 +354546,7 @@
 +        // NA
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java
@@ -354666,7 +354666,7 @@
 +    } // printError(String,SAXParseException)
 +
 +} // class DefaultErrorHandler
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java
@@ -355919,7 +355919,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java
@@ -356019,7 +356019,7 @@
 +        return msg;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java
@@ -356156,7 +356156,7 @@
 +    public void setSchemeData(String schemeData);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java
@@ -356265,7 +356265,7 @@
 +    public boolean isXPointerResolved() throws XNIException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java
@@ -356303,7 +356303,7 @@
 +    public XSAttributeDeclaration getAttributeDeclaration();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java
@@ -356358,7 +356358,7 @@
 +    public XSModel getSchemaInformation();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java
@@ -356552,7 +356552,7 @@
 +    public boolean getIsSchemaSpecified();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/LSInputList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/LSInputList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/LSInputList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/LSInputList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/LSInputList.java
@@ -356605,7 +356605,7 @@
 +    public LSInput item(int index);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java
@@ -356703,7 +356703,7 @@
 +                                                String localname);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ShortList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ShortList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ShortList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ShortList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/ShortList.java
@@ -356765,7 +356765,7 @@
 +                      throws XSException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/StringList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/StringList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/StringList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/StringList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/StringList.java
@@ -356825,7 +356825,7 @@
 +    public String item(int index);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java
@@ -356893,7 +356893,7 @@
 +    public String getAnnotationString();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java
@@ -357004,7 +357004,7 @@
 +    public XSAnnotation getAnnotation();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java
@@ -357052,7 +357052,7 @@
 +    public XSAnnotation getAnnotation();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java
@@ -357152,7 +357152,7 @@
 +                                       throws XSException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java
@@ -357274,7 +357274,7 @@
 +    public XSObjectList getAnnotations();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSConstants.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSConstants.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSConstants.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSConstants.java
@@ -357624,7 +357624,7 @@
 +    public static final short UNAVAILABLE_DT            = 45;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java
@@ -357804,7 +357804,7 @@
 +    public XSAnnotation getAnnotation();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSException.java
@@ -357865,7 +357865,7 @@
 +    public static final short INDEX_SIZE_ERR            = 2;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSFacet.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSFacet.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSFacet.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSFacet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSFacet.java
@@ -357919,7 +357919,7 @@
 +    public XSAnnotation getAnnotation();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java
@@ -357997,7 +357997,7 @@
 +    public XSObjectList getAnnotations();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSImplementation.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSImplementation.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSImplementation.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSImplementation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSImplementation.java
@@ -358053,7 +358053,7 @@
 +                                   throws XSException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSLoader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSLoader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSLoader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSLoader.java
@@ -358151,7 +358151,7 @@
 +    public XSModel load(LSInput is);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModel.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModel.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModel.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModel.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModel.java
@@ -358304,7 +358304,7 @@
 +                                                        String namespace);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java
@@ -358370,7 +358370,7 @@
 +    public XSAnnotation getAnnotation();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java
@@ -358412,7 +358412,7 @@
 +    public XSAnnotation getAnnotation();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java
@@ -358461,7 +358461,7 @@
 +    public XSObjectList getAnnotations();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java
@@ -358533,7 +358533,7 @@
 +                               String localName);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java
@@ -358648,7 +358648,7 @@
 +    public StringList getDocumentLocations();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java
@@ -358699,7 +358699,7 @@
 +    public XSNamespaceItem item(int index);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java
@@ -358748,7 +358748,7 @@
 +    public XSAnnotation getAnnotation();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSObject.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSObject.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSObject.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSObject.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSObject.java
@@ -358811,7 +358811,7 @@
 +    public XSNamespaceItem getNamespaceItem();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSObjectList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSObjectList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSObjectList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSObjectList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSObjectList.java
@@ -358862,7 +358862,7 @@
 +    public XSObject item(int index);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSParticle.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSParticle.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSParticle.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSParticle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSParticle.java
@@ -358918,7 +358918,7 @@
 +    public XSTerm getTerm();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java
@@ -359166,7 +359166,7 @@
 +    public XSObjectList getAnnotations();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSTerm.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSTerm.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSTerm.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSTerm.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSTerm.java
@@ -359201,7 +359201,7 @@
 + */
 +public interface XSTerm extends XSObject {
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java
@@ -359311,7 +359311,7 @@
 +                               short derivationMethod);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSWildcard.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSWildcard.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSWildcard.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSWildcard.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/XSWildcard.java
@@ -359401,7 +359401,7 @@
 +    public XSAnnotation getAnnotation();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java
@@ -359467,7 +359467,7 @@
 +    public byte item(int index) throws XSException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java
@@ -359531,7 +359531,7 @@
 +    public Object item(int index);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java
@@ -359829,7 +359829,7 @@
 +     */
 +    public Duration getDuration();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java
@@ -359901,7 +359901,7 @@
 +     */
 +    public byte getByte() throws NumberFormatException;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java
@@ -359941,7 +359941,7 @@
 +    public double getValue();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java
@@ -359981,7 +359981,7 @@
 +    public float getValue();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java
@@ -360025,7 +360025,7 @@
 +     */
 +    public javax.xml.namespace.QName getJAXPQName();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xs/datatypes/package.html
@@ -360339,7 +360339,7 @@
 +but NOT getShort() or getByte().</SPAN>
 +</P></body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/Axis.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/Axis.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/Axis.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/Axis.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/Axis.java
@@ -360566,7 +360566,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTM.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTM.java
@@ -361540,7 +361540,7 @@
 +    */
 +   public void migrateTo(DTMManager manager);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java
@@ -361657,7 +361657,7 @@
 +   */
 +  public int getNodeByPosition(int position);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java
@@ -361780,7 +361780,7 @@
 +   */
 +  public abstract int next(int context, int current, int extendedTypeID);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java
@@ -361886,7 +361886,7 @@
 +        super(message, locator, e);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java
@@ -361947,7 +361947,7 @@
 +    super(code, "");
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMException.java
@@ -362337,7 +362337,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMFilter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMFilter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMFilter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMFilter.java
@@ -362532,7 +362532,7 @@
 +  public short acceptNode(int nodeHandle, int whatToShow, int expandedName);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMIterator.java
@@ -362883,7 +362883,7 @@
 +  public int getAxis();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java
@@ -363320,7 +363320,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java
@@ -363383,7 +363383,7 @@
 +  public short getShouldStripSpace(int elementHandle, DTM dtm);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ObjectFactory.java
@@ -364051,7 +364051,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/SecuritySupport.java
@@ -364183,7 +364183,7 @@
 +        return f.lastModified();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/SecuritySupport12.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/SecuritySupport12.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/SecuritySupport12.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/SecuritySupport12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/SecuritySupport12.java
@@ -364336,7 +364336,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java
@@ -364649,7 +364649,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java
@@ -365000,7 +365000,7 @@
 +    notify();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java
@@ -365147,7 +365147,7 @@
 +  public void init( CoroutineManager co, int appCoroutineID, XMLReader parser );
 +
 +} // class CoroutineParser
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java
@@ -365242,7 +365242,7 @@
 +                return iobj.intValue();
 +        }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java
@@ -365391,7 +365391,7 @@
 +        return m_last;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java
@@ -365679,7 +365679,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java
@@ -365805,7 +365805,7 @@
 +        return count;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java
@@ -368183,7 +368183,7 @@
 +                 return m_dtmIdent;
 +         }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java
@@ -370383,7 +370383,7 @@
 +    }
 +  }  // end of TypedSingletonIterator
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java
@@ -372135,7 +372135,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java
@@ -374553,7 +374553,7 @@
 +   }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java
@@ -375419,7 +375419,7 @@
 +    return m_expandedNameTable;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java
@@ -375726,7 +375726,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java
@@ -375919,7 +375919,7 @@
 +      return dtm_iter.getDTM(handle).getNode(handle);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java
@@ -376053,7 +376053,7 @@
 +        return (m_iter != null) ? m_iter.getLength() : 0;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java
@@ -376141,7 +376141,7 @@
 +        return 0;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java
@@ -378463,7 +378463,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java
@@ -378580,7 +378580,7 @@
 +      } // end pass loop
 +  }
 +} // DTMSafeStringPool
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java
@@ -378778,7 +378778,7 @@
 +      } // end pass loop
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java
@@ -379188,7 +379188,7 @@
 +    }
 +  }
 +}  //TreeWalker
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java
@@ -379257,7 +379257,7 @@
 +
 +  public final int getNodeByPosition(int position){ return END; }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java
@@ -379655,7 +379655,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java
@@ -379807,7 +379807,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java
@@ -379903,7 +379903,7 @@
 +  public void startParse(InputSource source) throws SAXException;
 +
 +} // class IncrementalSAXSource
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java
@@ -380721,7 +380721,7 @@
 +  }
 +    */
 +} // class IncrementalSAXSource_Filter
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java
@@ -381182,7 +381182,7 @@
 +
 +
 +} // class IncrementalSAXSource_Xerces
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java
@@ -381299,7 +381299,7 @@
 +      + ", column #" + m_columnNumber;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/ObjectFactory.java
@@ -381967,7 +381967,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/SecuritySupport.java
@@ -382099,7 +382099,7 @@
 +        return f.lastModified();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/SecuritySupport12.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/SecuritySupport12.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/SecuritySupport12.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/SecuritySupport12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/SecuritySupport12.java
@@ -382252,7 +382252,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java
@@ -384022,7 +384022,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
@@ -384707,7 +384707,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java
@@ -387235,7 +387235,7 @@
 +    return m_fixednames[type];
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java
@@ -390625,7 +390625,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java
@@ -390994,7 +390994,7 @@
 +    return !m_endDocumentOccured;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources.java
@@ -391526,7 +391526,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java
@@ -392039,7 +392039,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java
@@ -392552,7 +392552,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
@@ -393065,7 +393065,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java
@@ -393103,7 +393103,7 @@
 +public class XMLErrorResources_en extends XMLErrorResources
 +{
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java
@@ -393616,7 +393616,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java
@@ -394129,7 +394129,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java
@@ -394642,7 +394642,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java
@@ -395155,7 +395155,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java
@@ -395668,7 +395668,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java
@@ -396181,7 +396181,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java
@@ -396814,7 +396814,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java
@@ -397327,7 +397327,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java
@@ -397840,7 +397840,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java
@@ -397922,7 +397922,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java
@@ -398435,7 +398435,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLMessages.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLMessages.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLMessages.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/res/XMLMessages.java
@@ -398656,7 +398656,7 @@
 +    return suffix;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/Catalog.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/Catalog.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/Catalog.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/Catalog.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/Catalog.java
@@ -400874,7 +400874,7 @@
 +  }
 +}
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java
@@ -401131,7 +401131,7 @@
 +    args.set(argNum, newspec);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogException.java
@@ -401304,7 +401304,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java
@@ -402147,7 +402147,7 @@
 +    return getCatalogClassName();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/Resolver.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/Resolver.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/Resolver.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/Resolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/Resolver.java
@@ -402842,7 +402842,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java
@@ -403050,7 +403050,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java
@@ -403166,7 +403166,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java
@@ -403264,7 +403264,7 @@
 +      return file.toURI().toURL();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java
@@ -403383,7 +403383,7 @@
 +        return getNamespaceURI(element, prefix);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java
@@ -403549,7 +403549,7 @@
 +    return result + str;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java
@@ -403635,7 +403635,7 @@
 +    public void readCatalog(Catalog catalog, InputStream is)
 +        throws IOException, CatalogException;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java
@@ -403693,7 +403693,7 @@
 +     */
 +    public void parseCatalogEntry(Catalog catalog, Node node);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java
@@ -403944,7 +403944,7 @@
 +    readCatalog(catalog, urlCon.getInputStream());
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java
@@ -404136,7 +404136,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java
@@ -404682,7 +404682,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java
@@ -404732,7 +404732,7 @@
 +    /** Set the Catalog for which parsing is being performed. */
 +    public void setCatalog(Catalog catalog);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java
@@ -405243,7 +405243,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java
@@ -405398,7 +405398,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java
@@ -405546,7 +405546,7 @@
 +
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java
@@ -405854,7 +405854,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java
@@ -406047,7 +406047,7 @@
 +    return;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java
@@ -406392,7 +406392,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java
@@ -406841,7 +406841,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java
@@ -407198,7 +407198,7 @@
 +    suppressExplanation = true;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java
@@ -407296,7 +407296,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java
@@ -409269,7 +409269,7 @@
 +
 +         }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java
@@ -409353,7 +409353,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java
@@ -410573,7 +410573,7 @@
 +
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/ElementState.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/ElementState.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/ElementState.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/ElementState.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/ElementState.java
@@ -410686,7 +410686,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java
@@ -410962,7 +410962,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Encodings.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Encodings.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Encodings.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Encodings.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Encodings.java
@@ -411091,7 +411091,7 @@
 +    +"\uff3c\uff5e\uffe0\uffe1\uffe2\uffe3";
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLEntities.res b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLEntities.res
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLEntities.res openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLEntities.res
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLEntities.res
@@ -411386,7 +411386,7 @@
 +lsaquo 8249
 +rsaquo 8250
 +euro 8364
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java
@@ -412272,7 +412272,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java
@@ -412834,7 +412834,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java
@@ -413204,7 +413204,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/LineSeparator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/LineSeparator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/LineSeparator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/LineSeparator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/LineSeparator.java
@@ -413266,7 +413266,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Method.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Method.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Method.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Method.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Method.java
@@ -413334,7 +413334,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/ObjectFactory.java
@@ -413892,7 +413892,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/OutputFormat.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/OutputFormat.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/OutputFormat.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/OutputFormat.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/OutputFormat.java
@@ -414858,7 +414858,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Printer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Printer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Printer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Printer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Printer.java
@@ -415227,7 +415227,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java
@@ -415384,7 +415384,7 @@
 +
 +    private SecuritySupport () {}
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Serializer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Serializer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Serializer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Serializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Serializer.java
@@ -415512,7 +415512,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java
@@ -415665,7 +415665,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java
@@ -415786,7 +415786,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/TextSerializer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/TextSerializer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/TextSerializer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/TextSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/TextSerializer.java
@@ -416181,7 +416181,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java
@@ -416290,7 +416290,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java
@@ -416832,7 +416832,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java
@@ -418306,7 +418306,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java
@@ -418550,7 +418550,7 @@
 +        return index;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java
@@ -419301,7 +419301,7 @@
 +   
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java
@@ -419374,7 +419374,7 @@
 +     */
 +    public void serialize(Node node) throws IOException;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ElemContext.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ElemContext.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ElemContext.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ElemContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ElemContext.java
@@ -419600,7 +419600,7 @@
 +        return frame;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ElemDesc.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ElemDesc.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ElemDesc.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ElemDesc.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ElemDesc.java
@@ -419785,7 +419785,7 @@
 +            : false;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java
@@ -420549,7 +420549,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java
@@ -421068,7 +421068,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Encodings.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Encodings.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Encodings.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Encodings.java
@@ -421537,7 +421537,7 @@
 +    private static final HashMap _encodingTableKeyMime = new HashMap();
 +    private static final EncodingInfo[] _encodings = loadEncodingInfo();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Encodings.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Encodings.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Encodings.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Encodings.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Encodings.properties
@@ -421660,7 +421660,7 @@
 +# note that more character set names and their aliases
 +# can be found at http://www.iana.org/assignments/character-sets
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java
@@ -421938,7 +421938,7 @@
 +        String value)
 +        throws SAXException;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java
@@ -421984,7 +421984,7 @@
 +     */
 +    public void comment(String comment) throws SAXException;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties
@@ -422303,7 +422303,7 @@
 +lsaquo=8249
 +rsaquo=8250
 +euro=8364
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Method.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Method.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Method.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Method.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Method.java
@@ -422386,7 +422386,7 @@
 +   */
 +  public static final String UNKNOWN = "";
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java
@@ -422718,7 +422718,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ObjectFactory.java
@@ -423385,7 +423385,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java
@@ -423908,7 +423908,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java
@@ -423998,7 +423998,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SecuritySupport.java
@@ -424128,7 +424128,7 @@
 +        return f.lastModified();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SecuritySupport12.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SecuritySupport12.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SecuritySupport12.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SecuritySupport12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SecuritySupport12.java
@@ -424278,7 +424278,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java
@@ -424411,7 +424411,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Serializer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Serializer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Serializer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Serializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Serializer.java
@@ -424639,7 +424639,7 @@
 +     */
 +    public boolean reset();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerBase.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerBase.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerBase.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerBase.java
@@ -426031,7 +426031,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java
@@ -426097,7 +426097,7 @@
 +    static final String XMLVERSION11 = "1.1";
 +    static final String XMLVERSION10 = "1.0";
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java
@@ -426289,7 +426289,7 @@
 +      return ser;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java
@@ -426449,7 +426449,7 @@
 +  public void fireGenerateEvent(int eventType, String data);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java
@@ -426797,7 +426797,7 @@
 +        return retval;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java
@@ -427549,7 +427549,7 @@
 +        this.m_escapeSetting = false;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java
@@ -429874,7 +429874,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java
@@ -430319,7 +430319,7 @@
 +        addAttribute(qName, value);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToStream.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToStream.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToStream.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToStream.java
@@ -433699,7 +433699,7 @@
 +        m_expandDTDEntities = expand;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java
@@ -434118,7 +434118,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToTextStream.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToTextStream.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToTextStream.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToTextStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToTextStream.java
@@ -434759,7 +434759,7 @@
 +            }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java
@@ -436102,7 +436102,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java
@@ -436885,7 +436885,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java
@@ -437520,7 +437520,7 @@
 +        return xmlVersion;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java
@@ -437583,7 +437583,7 @@
 +  void resetState(Transformer transformer);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java
@@ -438116,7 +438116,7 @@
 +    }
 +  }
 +}  //TreeWalker
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Utils.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Utils.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Utils.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Utils.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Utils.java
@@ -438201,7 +438201,7 @@
 +        return c;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Version.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Version.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Version.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Version.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Version.java
@@ -438358,7 +438358,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterChain.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterChain.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterChain.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterChain.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterChain.java
@@ -438447,7 +438447,7 @@
 +     */
 +    public java.io.OutputStream getOutputStream();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java
@@ -438609,7 +438609,7 @@
 +      return null;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java
@@ -439119,7 +439119,7 @@
 +    return null;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties
@@ -439156,7 +439156,7 @@
 +lt=60
 +gt=62
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java
@@ -439345,7 +439345,7 @@
 +    public void setVersion(String version);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_html.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_html.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_html.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_html.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_html.properties
@@ -439396,7 +439396,7 @@
 +{http\u003a//xml.apache.org/xalan}entities=com/sun/org/apache/xml/internal/serializer/HTMLEntities
 +{http\u003a//xml.apache.org/xalan}use-url-escaping=yes
 +{http\u003a//xml.apache.org/xalan}omit-meta-tag=no
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_text.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_text.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_text.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_text.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_text.properties
@@ -439440,7 +439440,7 @@
 +#  ...
 +# Note that the colon after the protocol needs to be escaped.
 +{http\u003a//xml.apache.org/xalan}content-handler=com.sun.org.apache.xml.internal.serializer.ToTextStream
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_unknown.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_unknown.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_unknown.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_unknown.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_unknown.properties
@@ -439493,7 +439493,7 @@
 +{http\u003a//xml.apache.org/xalan}indent-amount=0
 +{http\u003a//xml.apache.org/xalan}content-handler=com.sun.org.apache.xml.internal.serializer.ToUnknownStream
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_xml.properties b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_xml.properties
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_xml.properties openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_xml.properties
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/output_xml.properties
@@ -439546,7 +439546,7 @@
 +{http\u003a//xml.apache.org/xalan}content-handler=com.sun.org.apache.xml.internal.serializer.ToXMLStream
 +{http\u003a//xml.apache.org/xalan}entities=com/sun/org/apache/xml/internal/serializer/XMLEntities
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/package.html
@@ -439596,7 +439596,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/AttList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/AttList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/AttList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/AttList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/AttList.java
@@ -439866,7 +439866,7 @@
 +    return -1;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java
@@ -440077,7 +440077,7 @@
 +    m_values = newVector;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java
@@ -440218,7 +440218,7 @@
 +   * references it, so I've commented this out as well. */
 +  //private boolean m_useDOM2getNamespaceURI = false;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/Messages.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/Messages.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/Messages.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/Messages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/Messages.java
@@ -440591,7 +440591,7 @@
 +        return suffix;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java
@@ -440698,7 +440698,7 @@
 +    public static final String ER_ENCODING_NOT_SUPPORTED = "ER_ENCODING_NOT_SUPPORTED";
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java
@@ -440911,7 +440911,7 @@
 +        return contents;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java
@@ -441046,7 +441046,7 @@
 +    return contents;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java
@@ -441173,7 +441173,7 @@
 +    return contents;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
@@ -441300,7 +441300,7 @@
 +    return contents;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java
@@ -441337,7 +441337,7 @@
 +public final class SerializerMessages_en extends SerializerMessages
 +{
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java
@@ -441464,7 +441464,7 @@
 +    return contents;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java
@@ -441591,7 +441591,7 @@
 +    return contents;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java
@@ -441718,7 +441718,7 @@
 +    return contents;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java
@@ -441845,7 +441845,7 @@
 +    return contents;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java
@@ -441972,7 +441972,7 @@
 +    return contents;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java
@@ -442077,7 +442077,7 @@
 +    return contents;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java
@@ -442204,7 +442204,7 @@
 +    return contents;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java
@@ -442331,7 +442331,7 @@
 +    return contents;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java
@@ -442541,7 +442541,7 @@
 +    return keysArr;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java
@@ -442850,7 +442850,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/URI.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/URI.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/URI.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/URI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/URI.java
@@ -444511,7 +444511,7 @@
 +    return true;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/Utils.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/Utils.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/Utils.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/Utils.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/Utils.java
@@ -444561,7 +444561,7 @@
 +        new com.sun.org.apache.xml.internal.serializer.utils.Messages(
 +            "com.sun.org.apache.xml.internal.serializer.utils.SerializerMessages");
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java
@@ -444649,7 +444649,7 @@
 +    return m_exception;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/AttList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/AttList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/AttList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/AttList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/AttList.java
@@ -444910,7 +444910,7 @@
 +    return -1;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/BoolStack.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/BoolStack.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/BoolStack.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/BoolStack.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/BoolStack.java
@@ -445119,7 +445119,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/CharKey.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/CharKey.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/CharKey.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/CharKey.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/CharKey.java
@@ -445210,7 +445210,7 @@
 +    return ((CharKey)obj).m_char == m_char;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Constants.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Constants.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Constants.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Constants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Constants.java
@@ -445329,7 +445329,7 @@
 +   */
 +  public static final double XSLTVERSUPPORTED = 1.0;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOM2Helper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOM2Helper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOM2Helper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOM2Helper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOM2Helper.java
@@ -445650,7 +445650,7 @@
 +   * references it, so I've commented this out as well. */
 +  //private boolean m_useDOM2getNamespaceURI = false;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMBuilder.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMBuilder.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMBuilder.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMBuilder.java
@@ -446445,7 +446445,7 @@
 +   */
 +  public void skippedEntity(String name) throws org.xml.sax.SAXException{}
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java
@@ -447786,7 +447786,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMOrder.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMOrder.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMOrder.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMOrder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMOrder.java
@@ -447834,7 +447834,7 @@
 +   */
 +  public int getUid();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java
@@ -448183,7 +448183,7 @@
 +      pw.print("("+XMLMessages.createXMLMessage(XMLErrorResources.ER_LOCATION_UNKNOWN, null)+")");
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java
@@ -448379,7 +448379,7 @@
 +    return false;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java
@@ -449682,7 +449682,7 @@
 +    source.m_chunkMask = source.m_chunkSize - 1;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java
@@ -449829,7 +449829,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/IntStack.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/IntStack.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/IntStack.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/IntStack.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/IntStack.java
@@ -450047,7 +450047,7 @@
 +        return (IntStack) super.clone();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/IntVector.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/IntVector.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/IntVector.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/IntVector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/IntVector.java
@@ -450473,7 +450473,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java
@@ -451045,7 +451045,7 @@
 +    protected boolean throwOnFatalError = true;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/LocaleUtility.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/LocaleUtility.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/LocaleUtility.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/LocaleUtility.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/LocaleUtility.java
@@ -451138,7 +451138,7 @@
 +
 +
 + }
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java
@@ -451284,7 +451284,7 @@
 +}
 +
 +// end of MutableAttrListImpl.java
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NSInfo.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NSInfo.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NSInfo.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NSInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NSInfo.java
@@ -451401,7 +451401,7 @@
 +  /** Constant indicating ancestors don't have an XMLNS attribute           */
 +  public static final int ANCESTORNOXMLNS = 2;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NameSpace.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NameSpace.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NameSpace.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NameSpace.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NameSpace.java
@@ -451467,7 +451467,7 @@
 +    m_uri = uri;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java
@@ -452223,7 +452223,7 @@
 +
 +
 +// end of NamespaceSupport2.java
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NodeConsumer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NodeConsumer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NodeConsumer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NodeConsumer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NodeConsumer.java
@@ -452270,7 +452270,7 @@
 +   */
 +  public void setOriginatingNode(Node n);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NodeVector.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NodeVector.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NodeVector.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NodeVector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NodeVector.java
@@ -453016,7 +453016,7 @@
 +    sort(m_map, 0, m_firstFree - 1);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectFactory.java
@@ -453679,7 +453679,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectPool.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectPool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectPool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectPool.java
@@ -453865,7 +453865,7 @@
 +    // }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectStack.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectStack.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectStack.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectStack.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectStack.java
@@ -454087,7 +454087,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectVector.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectVector.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectVector.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectVector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ObjectVector.java
@@ -454525,7 +454525,7 @@
 +        return new ObjectVector(this);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/PrefixResolver.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/PrefixResolver.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/PrefixResolver.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/PrefixResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/PrefixResolver.java
@@ -454604,7 +454604,7 @@
 +
 +  public boolean handlesNullPrefixes();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java
@@ -454756,7 +454756,7 @@
 +        }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/QName.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/QName.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/QName.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/QName.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/QName.java
@@ -455472,7 +455472,7 @@
 +    return (index >= 0) ? qname.substring(0, index) : "";
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java
@@ -455521,7 +455521,7 @@
 +  public void charactersRaw(char ch[], int start, int length)
 +    throws javax.xml.transform.TransformerException;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java
@@ -455698,7 +455698,7 @@
 +    return (null == m_locator) ? super.getColumnNumber() : m_locator.getColumnNumber();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SecuritySupport.java
@@ -455830,7 +455830,7 @@
 +        return f.lastModified();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SecuritySupport12.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SecuritySupport12.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SecuritySupport12.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SecuritySupport12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SecuritySupport12.java
@@ -455983,7 +455983,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java
@@ -456215,7 +456215,7 @@
 +}
 +
 +// end of LocatorImpl.java
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StopParseException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StopParseException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StopParseException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StopParseException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StopParseException.java
@@ -456262,7 +456262,7 @@
 +    super("Stylesheet PIs found, stop the parse");
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringBufferPool.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringBufferPool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringBufferPool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringBufferPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringBufferPool.java
@@ -456329,7 +456329,7 @@
 +    m_stringBufPool.freeInstance(sb);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringComparable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringComparable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringComparable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringComparable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringComparable.java
@@ -456549,7 +456549,7 @@
 +  }
 +
 +}//StringComparable
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToIntTable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToIntTable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToIntTable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToIntTable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToIntTable.java
@@ -456752,7 +456752,7 @@
 +    return keysArr;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToStringTable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToStringTable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToStringTable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToStringTable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToStringTable.java
@@ -457001,7 +457001,7 @@
 +    return false;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java
@@ -457207,7 +457207,7 @@
 +    return false;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringVector.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringVector.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringVector.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringVector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StringVector.java
@@ -457437,7 +457437,7 @@
 +    return (m_firstFree <= 0) ? null : m_map[m_firstFree - 1];
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java
@@ -457784,7 +457784,7 @@
 +   }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java
@@ -458289,7 +458289,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java
@@ -458853,7 +458853,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java
@@ -459155,7 +459155,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java
@@ -459286,7 +459286,7 @@
 +  }
 + 
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/TreeWalker.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/TreeWalker.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/TreeWalker.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/TreeWalker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/TreeWalker.java
@@ -459785,7 +459785,7 @@
 +    }
 +  }
 +}  //TreeWalker
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Trie.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Trie.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Trie.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Trie.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/Trie.java
@@ -459997,7 +459997,7 @@
 +    Object m_Value;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/URI.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/URI.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/URI.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/URI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/URI.java
@@ -461678,7 +461678,7 @@
 +    return true;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/UnImplNode.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/UnImplNode.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/UnImplNode.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/UnImplNode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/UnImplNode.java
@@ -463737,7 +463737,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java
@@ -463818,7 +463818,7 @@
 +    return m_exception;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/WrongParserException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/WrongParserException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/WrongParserException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/WrongParserException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/WrongParserException.java
@@ -463865,7 +463865,7 @@
 +    super(message);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XML11Char.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XML11Char.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XML11Char.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XML11Char.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XML11Char.java
@@ -464302,7 +464302,7 @@
 +     }
 +
 +} // class XML11Char
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLChar.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLChar.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLChar.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLChar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLChar.java
@@ -464976,7 +464976,7 @@
 +    }
 +
 +} // class XMLChar
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java
@@ -465092,7 +465092,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java
@@ -465263,7 +465263,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLString.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLString.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLString.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLString.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLString.java
@@ -465945,7 +465945,7 @@
 +   */
 +  public double toDouble();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java
@@ -466754,7 +466754,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java
@@ -466832,7 +466832,7 @@
 +   */
 +  public abstract XMLString emptystr();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java
@@ -466923,7 +466923,7 @@
 +    return EMPTY_STR;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/package.html
@@ -466957,7 +466957,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java
@@ -467006,7 +467006,7 @@
 +        return m_char.length;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java
@@ -467055,7 +467055,7 @@
 +        return m_int.length;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java
@@ -467104,7 +467104,7 @@
 +        return m_long.length;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java
@@ -467153,7 +467153,7 @@
 +        return m_string.length;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java
@@ -467300,7 +467300,7 @@
 +  };
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java
@@ -467357,7 +467357,7 @@
 +   */
 +  abstract public String getWarningKey(int errorCode);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_de.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_de.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_de.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_de.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_de.java
@@ -467437,7 +467437,7 @@
 +  };
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_en.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_en.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_en.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_en.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_en.java
@@ -467517,7 +467517,7 @@
 +  };
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_es.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_es.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_es.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_es.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_es.java
@@ -467597,7 +467597,7 @@
 +  };
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java
@@ -467677,7 +467677,7 @@
 +  };
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_it.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_it.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_it.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_it.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_it.java
@@ -467757,7 +467757,7 @@
 +  };
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java
@@ -467850,7 +467850,7 @@
 +  };
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java
@@ -467943,7 +467943,7 @@
 +  };
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java
@@ -468037,7 +468037,7 @@
 +  };
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java
@@ -468130,7 +468130,7 @@
 +  };
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java
@@ -468217,7 +468217,7 @@
 +  };
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java
@@ -468297,7 +468297,7 @@
 +  };
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java
@@ -468384,7 +468384,7 @@
 +  };
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java b/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java
@@ -468471,7 +468471,7 @@
 +  };
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/Arg.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/Arg.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/Arg.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/Arg.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/Arg.java
@@ -468736,7 +468736,7 @@
 +    m_expression = null;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/CachedXPathAPI.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/CachedXPathAPI.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/CachedXPathAPI.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/CachedXPathAPI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/CachedXPathAPI.java
@@ -469078,7 +469078,7 @@
 +    return xpath.execute(xpathSupport, ctxtNode, prefixResolver);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/Expression.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/Expression.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/Expression.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/Expression.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/Expression.java
@@ -469674,7 +469674,7 @@
 +        return m_parent.getColumnNumber();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExpressionNode.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExpressionNode.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExpressionNode.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExpressionNode.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExpressionNode.java
@@ -469732,7 +469732,7 @@
 +  /** Return the number of children the node has. */
 +  public int exprGetNumChildren();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExpressionOwner.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExpressionOwner.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExpressionOwner.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExpressionOwner.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExpressionOwner.java
@@ -469783,7 +469783,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExtensionsProvider.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExtensionsProvider.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExtensionsProvider.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExtensionsProvider.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/ExtensionsProvider.java
@@ -469850,7 +469850,7 @@
 +                            Vector argVec)
 +            throws javax.xml.transform.TransformerException;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/FoundIndex.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/FoundIndex.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/FoundIndex.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/FoundIndex.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/FoundIndex.java
@@ -469894,7 +469894,7 @@
 +   */
 +  public FoundIndex(){}
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/NodeSet.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/NodeSet.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/NodeSet.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/NodeSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/NodeSet.java
@@ -471271,7 +471271,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/NodeSetDTM.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/NodeSetDTM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/NodeSetDTM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/NodeSetDTM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/NodeSetDTM.java
@@ -472525,7 +472525,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/SourceTree.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/SourceTree.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/SourceTree.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/SourceTree.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/SourceTree.java
@@ -472584,7 +472584,7 @@
 +   * {@link org.w3c.dom.Document} node.  */
 +  public int m_root;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/SourceTreeManager.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/SourceTreeManager.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/SourceTreeManager.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/SourceTreeManager.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/SourceTreeManager.java
@@ -472981,7 +472981,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/VariableStack.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/VariableStack.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/VariableStack.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/VariableStack.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/VariableStack.java
@@ -473506,7 +473506,7 @@
 +    throw new javax.xml.transform.TransformerException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_VAR_NOT_RESOLVABLE, new Object[]{qname.toString()})); //"Variable not resolvable: " + qname);
 +  }
 +}  // end VariableStack
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java
@@ -473567,7 +473567,7 @@
 +   */
 +  public boolean canStripWhiteSpace();
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPath.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPath.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPath.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPath.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPath.java
@@ -474217,7 +474217,7 @@
 +   */
 +  public static final double MATCH_SCORE_OTHER = 0.5;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathAPI.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathAPI.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathAPI.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathAPI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathAPI.java
@@ -474507,7 +474507,7 @@
 +    return xpath.execute(xpathSupport, ctxtNode, prefixResolver);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathContext.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathContext.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathContext.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathContext.java
@@ -475842,7 +475842,7 @@
 +    m_DTMXRTreeFrags = null;
 + }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathException.java
@@ -476177,7 +476177,7 @@
 +    return m_exception;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathFactory.java
@@ -476234,7 +476234,7 @@
 +  XPath create(String exprString, SourceLocator locator,
 +               PrefixResolver prefixResolver, int type);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathProcessorException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathProcessorException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathProcessorException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathProcessorException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathProcessorException.java
@@ -476295,7 +476295,7 @@
 +    super(message, e);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathVisitable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathVisitable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathVisitable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathVisitable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathVisitable.java
@@ -476343,7 +476343,7 @@
 +         */
 +        public void callVisitors(ExpressionOwner owner, XPathVisitor visitor);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathVisitor.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathVisitor.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathVisitor.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathVisitor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/XPathVisitor.java
@@ -476552,7 +476552,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java
@@ -476634,7 +476634,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/AxesWalker.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/AxesWalker.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/AxesWalker.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/AxesWalker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/AxesWalker.java
@@ -477231,7 +477231,7 @@
 +  /** The DTM inner traversal class, that corresponds to the super axis. */
 +  protected DTMAxisTraverser m_traverser;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java
@@ -477462,7 +477462,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ChildIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ChildIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ChildIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ChildIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ChildIterator.java
@@ -477590,7 +477590,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java
@@ -477775,7 +477775,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java
@@ -477918,7 +477918,7 @@
 +   */
 +  public void setLast(int last);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java
@@ -478304,7 +478304,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java
@@ -478525,7 +478525,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java
@@ -478846,7 +478846,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java
@@ -479203,7 +479203,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java
@@ -479333,7 +479333,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/IteratorPool.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/IteratorPool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/IteratorPool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/IteratorPool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/IteratorPool.java
@@ -479463,7 +479463,7 @@
 +    m_freeStack.addElement(obj);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java
@@ -480503,7 +480503,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java
@@ -480840,7 +480840,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/NodeSequence.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/NodeSequence.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/NodeSequence.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/NodeSequence.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/NodeSequence.java
@@ -481807,7 +481807,7 @@
 +    }
 +}
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java
@@ -482158,7 +482158,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java
@@ -482336,7 +482336,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/PathComponent.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/PathComponent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/PathComponent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/PathComponent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/PathComponent.java
@@ -482378,7 +482378,7 @@
 +  public int getAnalysisBits();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java
@@ -483032,7 +483032,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/RTFIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/RTFIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/RTFIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/RTFIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/RTFIterator.java
@@ -483081,7 +483081,7 @@
 +                super(root, manager);
 +        }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java
@@ -483335,7 +483335,7 @@
 +  /** The DTM inner traversal class, that corresponds to the super axis. */
 +  protected DTMAxisIterator m_iterator;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java
@@ -483470,7 +483470,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/SubContextList.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/SubContextList.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/SubContextList.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/SubContextList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/SubContextList.java
@@ -483529,7 +483529,7 @@
 +   */
 +  public int getProximityPosition(XPathContext xctxt);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java
@@ -483686,7 +483686,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java
@@ -484276,7 +484276,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java
@@ -486109,7 +486109,7 @@
 +  /** Bit is on if the expression is a match pattern. */
 +  public static final int BIT_MATCH_PATTERN = (0x00001000 << 19);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java
@@ -486478,7 +486478,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java
@@ -486699,7 +486699,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/axes/package.html
@@ -486733,7 +486733,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Compiler.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Compiler.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Compiler.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Compiler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Compiler.java
@@ -488008,7 +488008,7 @@
 +   */
 +  private FunctionTable m_functionTable;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java
@@ -488121,7 +488121,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java
@@ -488536,7 +488536,7 @@
 +      }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java
@@ -488829,7 +488829,7 @@
 +          return m_nodetypes.get(key);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Lexer.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Lexer.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Lexer.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Lexer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Lexer.java
@@ -489498,7 +489498,7 @@
 +    return -1;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/ObjectFactory.java
@@ -490138,7 +490138,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpCodes.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpCodes.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpCodes.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpCodes.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpCodes.java
@@ -490777,7 +490777,7 @@
 +  /** The next free ID.  Please keep this up to date.  */
 +  private static final int NEXT_FREE_ID = 99;
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpMap.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpMap.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpMap.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpMap.java
@@ -491239,7 +491239,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java
@@ -491362,7 +491362,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java
@@ -491428,7 +491428,7 @@
 +   */
 +  public static final String PSEUDONAME_OTHER = "*";
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/SecuritySupport.java
@@ -491560,7 +491560,7 @@
 +        return f.lastModified();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/SecuritySupport12.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/SecuritySupport12.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/SecuritySupport12.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/SecuritySupport12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/SecuritySupport12.java
@@ -491713,7 +491713,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java
@@ -491751,7 +491751,7 @@
 +
 +  // deleted for the time being.
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/XPathParser.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/XPathParser.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/XPathParser.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/XPathParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/XPathParser.java
@@ -494159,7 +494159,7 @@
 +    return trailingSlashConsumed;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/package.html
@@ -494192,7 +494192,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java
@@ -494470,7 +494470,7 @@
 +        }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java
@@ -494660,7 +494660,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java
@@ -494728,7 +494728,7 @@
 +        }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java
@@ -495057,7 +495057,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java
@@ -495574,7 +495574,7 @@
 +}
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java
@@ -495642,7 +495642,7 @@
 +                super(msg, arg1);
 +        }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/domapi/package.html
@@ -495675,7 +495675,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java
@@ -495730,7 +495730,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java
@@ -495784,7 +495784,7 @@
 +    return new XNumber(Math.ceil(m_arg0.execute(xctxt).num()));
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncConcat.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncConcat.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncConcat.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncConcat.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncConcat.java
@@ -495881,7 +495881,7 @@
 +      throw new WrongNumberArgsException(XSLMessages.createXPATHMessage("gtone", null));
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncContains.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncContains.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncContains.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncContains.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncContains.java
@@ -495945,7 +495945,7 @@
 +    return (index > -1) ? XBoolean.S_TRUE : XBoolean.S_FALSE;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCount.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCount.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCount.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCount.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCount.java
@@ -496016,7 +496016,7 @@
 +    return new XNumber((double) i);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java
@@ -496105,7 +496105,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java
@@ -496183,7 +496183,7 @@
 +    return new XString((null != fileLocation) ? fileLocation : "");
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java
@@ -496287,7 +496287,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java
@@ -496634,7 +496634,7 @@
 +      return m_extensionName;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java
@@ -496745,7 +496745,7 @@
 +          m_functionTable = aTable;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncFalse.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncFalse.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncFalse.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncFalse.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncFalse.java
@@ -496808,7 +496808,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncFloor.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncFloor.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncFloor.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncFloor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncFloor.java
@@ -496862,7 +496862,7 @@
 +    return new XNumber(java.lang.Math.floor(m_arg0.execute(xctxt).num()));
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java
@@ -496931,7 +496931,7 @@
 +      return XString.EMPTYSTRING;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncId.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncId.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncId.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncId.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncId.java
@@ -497089,7 +497089,7 @@
 +    return nodes;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLang.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLang.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLang.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLang.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLang.java
@@ -497178,7 +497178,7 @@
 +    return isLang ? XBoolean.S_TRUE : XBoolean.S_FALSE;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLast.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLast.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLast.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLast.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLast.java
@@ -497291,7 +497291,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java
@@ -497355,7 +497355,7 @@
 +    return new XString(s);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java
@@ -497440,7 +497440,7 @@
 +    return ((null == s) ? XString.EMPTYSTRING : new XString(s));
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java
@@ -497533,7 +497533,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNot.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNot.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNot.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNot.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNot.java
@@ -497587,7 +497587,7 @@
 +    return m_arg0.execute(xctxt).bool() ? XBoolean.S_FALSE : XBoolean.S_TRUE;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNumber.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNumber.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNumber.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNumber.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncNumber.java
@@ -497641,7 +497641,7 @@
 +    return new XNumber(getArg0AsNumber(xctxt));
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncPosition.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncPosition.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncPosition.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncPosition.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncPosition.java
@@ -497782,7 +497782,7 @@
 +    // no-op
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncQname.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncQname.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncQname.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncQname.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncQname.java
@@ -497852,7 +497852,7 @@
 +    return val;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncRound.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncRound.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncRound.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncRound.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncRound.java
@@ -497911,7 +497911,7 @@
 +                                            + 0.5));
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java
@@ -497966,7 +497966,7 @@
 +           ? XBoolean.S_TRUE : XBoolean.S_FALSE;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncString.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncString.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncString.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncString.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncString.java
@@ -498020,7 +498020,7 @@
 +    return (XString)getArg0AsString(xctxt);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java
@@ -498074,7 +498074,7 @@
 +    return new XNumber(getArg0AsString(xctxt).length());
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java
@@ -498205,7 +498205,7 @@
 +      throw new WrongNumberArgsException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_TWO_OR_THREE, null)); //"2 or 3");
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java
@@ -498267,7 +498267,7 @@
 +           : (XString)s1.substring(index + s2.length());
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java
@@ -498327,7 +498327,7 @@
 +           ? XString.EMPTYSTRING : new XString(s1.substring(0, index));
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSum.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSum.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSum.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSum.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSum.java
@@ -498399,7 +498399,7 @@
 +    return new XNumber(sum);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java
@@ -498592,7 +498592,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java
@@ -498687,7 +498687,7 @@
 +    return new XString(sbuffer.toString());
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncTrue.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncTrue.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncTrue.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncTrue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncTrue.java
@@ -498750,7 +498750,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java
@@ -498812,7 +498812,7 @@
 +    return new XString(uri);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function.java
@@ -498963,7 +498963,7 @@
 +    // no default action
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function2Args.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function2Args.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function2Args.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function2Args.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function2Args.java
@@ -499154,7 +499154,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function3Args.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function3Args.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function3Args.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function3Args.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/Function3Args.java
@@ -499344,7 +499344,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java
@@ -499518,7 +499518,7 @@
 +    return (null == m_arg0) ? false : super.canTraverseOutsideSubtree();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java
@@ -499761,7 +499761,7 @@
 +      return true;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java
@@ -499942,7 +499942,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/ObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/ObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/ObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/ObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/ObjectFactory.java
@@ -500610,7 +500610,7 @@
 +    } // class ConfigurationError
 +
 +} // class ObjectFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/SecuritySupport.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/SecuritySupport.java
@@ -500742,7 +500742,7 @@
 +        return f.lastModified();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/SecuritySupport12.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/SecuritySupport12.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/SecuritySupport12.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/SecuritySupport12.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/SecuritySupport12.java
@@ -500895,7 +500895,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java
@@ -500945,7 +500945,7 @@
 +    super(argsExpected);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/functions/package.html
@@ -500981,7 +500981,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java
@@ -501196,7 +501196,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java
@@ -501329,7 +501329,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java
@@ -501408,7 +501408,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java
@@ -501785,7 +501785,7 @@
 +    }
 +
 + }
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java
@@ -502076,7 +502076,7 @@
 +
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java
@@ -502623,7 +502623,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java
@@ -502688,7 +502688,7 @@
 + }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XBoolean.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XBoolean.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XBoolean.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XBoolean.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XBoolean.java
@@ -502863,7 +502863,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java
@@ -502939,7 +502939,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java
@@ -503047,7 +503047,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNodeSet.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNodeSet.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNodeSet.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNodeSet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNodeSet.java
@@ -504023,7 +504023,7 @@
 +    return n1 != n2;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java
@@ -504158,7 +504158,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNull.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNull.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNull.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNull.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNull.java
@@ -504295,7 +504295,7 @@
 +    return obj2.getType() == CLASS_NULL;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNumber.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNumber.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNumber.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNumber.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XNumber.java
@@ -504739,7 +504739,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XObject.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XObject.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XObject.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XObject.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XObject.java
@@ -505505,7 +505505,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java
@@ -505673,7 +505673,7 @@
 +    return result;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java
@@ -505981,7 +505981,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java
@@ -506142,7 +506142,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XString.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XString.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XString.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XString.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XString.java
@@ -507252,7 +507252,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XStringForChars.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XStringForChars.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XStringForChars.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XStringForChars.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XStringForChars.java
@@ -507475,7 +507475,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java
@@ -508468,7 +508468,7 @@
 +    }
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/objects/package.html
@@ -508502,7 +508502,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/And.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/And.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/And.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/And.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/And.java
@@ -508584,7 +508584,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Bool.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Bool.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Bool.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Bool.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Bool.java
@@ -508659,7 +508659,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Div.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Div.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Div.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Div.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Div.java
@@ -508733,7 +508733,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Equals.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Equals.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Equals.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Equals.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Equals.java
@@ -508814,7 +508814,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Gt.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Gt.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Gt.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Gt.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Gt.java
@@ -508870,7 +508870,7 @@
 +    return left.greaterThan(right) ? XBoolean.S_TRUE : XBoolean.S_FALSE;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Gte.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Gte.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Gte.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Gte.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Gte.java
@@ -508927,7 +508927,7 @@
 +           ? XBoolean.S_TRUE : XBoolean.S_FALSE;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Lt.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Lt.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Lt.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Lt.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Lt.java
@@ -508983,7 +508983,7 @@
 +    return left.lessThan(right) ? XBoolean.S_TRUE : XBoolean.S_FALSE;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Lte.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Lte.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Lte.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Lte.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Lte.java
@@ -509039,7 +509039,7 @@
 +    return left.lessThanOrEqual(right) ? XBoolean.S_TRUE : XBoolean.S_FALSE;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Minus.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Minus.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Minus.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Minus.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Minus.java
@@ -509114,7 +509114,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Mod.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Mod.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Mod.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Mod.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Mod.java
@@ -509188,7 +509188,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Mult.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Mult.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Mult.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Mult.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Mult.java
@@ -509261,7 +509261,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Neg.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Neg.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Neg.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Neg.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Neg.java
@@ -509333,7 +509333,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/NotEquals.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/NotEquals.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/NotEquals.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/NotEquals.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/NotEquals.java
@@ -509389,7 +509389,7 @@
 +    return (left.notEquals(right)) ? XBoolean.S_TRUE : XBoolean.S_FALSE;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Number.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Number.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Number.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Number.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Number.java
@@ -509465,7 +509465,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Operation.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Operation.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Operation.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Operation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Operation.java
@@ -509684,7 +509684,7 @@
 +        return true;
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Or.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Or.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Or.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Or.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Or.java
@@ -509766,7 +509766,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Plus.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Plus.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Plus.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Plus.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Plus.java
@@ -509840,7 +509840,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Quo.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Quo.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Quo.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Quo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Quo.java
@@ -509899,7 +509899,7 @@
 +    return new XNumber((int) (left.num() / right.num()));
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/String.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/String.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/String.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/String.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/String.java
@@ -509953,7 +509953,7 @@
 +    return (XString)right.xstr(); // semi-safe cast.
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java
@@ -510123,7 +510123,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Variable.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Variable.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Variable.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Variable.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/Variable.java
@@ -510527,7 +510527,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java
@@ -510607,7 +510607,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/operations/package.html
@@ -510640,7 +510640,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/package.html
@@ -510674,7 +510674,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java
@@ -510860,7 +510860,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java
@@ -511115,7 +511115,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/NodeTest.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/NodeTest.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/NodeTest.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/NodeTest.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/NodeTest.java
@@ -511814,7 +511814,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java
@@ -511860,7 +511860,7 @@
 +   */
 +  void setNodeTest(NodeTest nodeTest);
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/StepPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/StepPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/StepPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/StepPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/StepPattern.java
@@ -512920,7 +512920,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java
@@ -513145,7 +513145,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/patterns/package.html
@@ -513178,7 +513178,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java
@@ -514188,7 +514188,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
@@ -515529,7 +515529,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java
@@ -515567,7 +515567,7 @@
 +public class XPATHErrorResources_en extends XPATHErrorResources
 +{
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java
@@ -516912,7 +516912,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java
@@ -518254,7 +518254,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java
@@ -519598,7 +519598,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
@@ -520939,7 +520939,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java
@@ -522280,7 +522280,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java
@@ -523540,7 +523540,7 @@
 +}
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
@@ -524882,7 +524882,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java
@@ -526224,7 +526224,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHMessages.java b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHMessages.java
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHMessages.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHMessages.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/XPATHMessages.java
@@ -526380,7 +526380,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/package.html b/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/package.html
+diff --git a/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/package.html openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/res/package.html
@@ -526417,7 +526417,7 @@
 +</html>
 +
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/Entity.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/Entity.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/Entity.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/Entity.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/Entity.java
@@ -526893,7 +526893,7 @@
 +    } // class ScannedEntity
 +
 +} // class Entity
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/EventFilterSupport.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/EventFilterSupport.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/EventFilterSupport.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/EventFilterSupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/EventFilterSupport.java
@@ -527012,7 +527012,7 @@
 +     }
 +
 +}//EventFilterSupport
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java
@@ -527101,7 +527101,7 @@
 +        return null ;
 +    }
 +}//class StaxEntityResolverWrapper
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxErrorReporter.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxErrorReporter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxErrorReporter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxErrorReporter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxErrorReporter.java
@@ -527293,7 +527293,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxXMLInputSource.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxXMLInputSource.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxXMLInputSource.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxXMLInputSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/StaxXMLInputSource.java
@@ -527373,7 +527373,7 @@
 +        return (fStreamReader == null) && (fEventReader == null) ? false : true ;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLBufferListener.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLBufferListener.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLBufferListener.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLBufferListener.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLBufferListener.java
@@ -527428,7 +527428,7 @@
 +    public void refresh(int loadPosition);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEntityReader.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEntityReader.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEntityReader.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEntityReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEntityReader.java
@@ -527735,7 +527735,7 @@
 +    public abstract void registerListener(XMLBufferListener listener);
 +
 +} // class XMLEntityScanner
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEntityStorage.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEntityStorage.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEntityStorage.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEntityStorage.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEntityStorage.java
@@ -528359,7 +528359,7 @@
 +        fInExternalSubset = false;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEventReaderImpl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEventReaderImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEventReaderImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEventReaderImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEventReaderImpl.java
@@ -528648,7 +528648,7 @@
 +    private XMLEvent fLastEvent;
 +    
 +}//XMLEventReaderImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLInputFactoryImpl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLInputFactoryImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLInputFactoryImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLInputFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLInputFactoryImpl.java
@@ -528958,7 +528958,7 @@
 +    }
 +    
 +}//XMLInputFactoryImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java
@@ -529162,7 +529162,7 @@
 +     * <code>XMLStreamWriterImpl</code> */
 +    private boolean fPropertyChanged ;
 +}//XMLOutputFactory
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java
@@ -529669,7 +529669,7 @@
 +        return false;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java
@@ -530670,7 +530670,7 @@
 +
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java
@@ -530737,7 +530737,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java
@@ -530825,7 +530825,7 @@
 +    } // clear
 +
 +} // class XMLElementDecl
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java
@@ -530901,7 +530901,7 @@
 +    } // clear
 +
 +} // class XMLNotationDecl
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java
@@ -531079,7 +531079,7 @@
 +    }
 +
 +} // class XMLSimpleType
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/AttributeImpl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/AttributeImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/AttributeImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/AttributeImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/AttributeImpl.java
@@ -531246,7 +531246,7 @@
 +    
 +}//AttributeImpl
 +
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/CharacterEvent.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/CharacterEvent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/CharacterEvent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/CharacterEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/CharacterEvent.java
@@ -531447,7 +531447,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/CommentEvent.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/CommentEvent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/CommentEvent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/CommentEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/CommentEvent.java
@@ -531528,7 +531528,7 @@
 +    }    
 +    
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/DTDEvent.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/DTDEvent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/DTDEvent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/DTDEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/DTDEvent.java
@@ -531637,7 +531637,7 @@
 +        writer.write(fDoctypeDeclaration);
 +    }    
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/DummyEvent.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/DummyEvent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/DummyEvent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/DummyEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/DummyEvent.java
@@ -531900,7 +531900,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EndDocumentEvent.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EndDocumentEvent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EndDocumentEvent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EndDocumentEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EndDocumentEvent.java
@@ -531966,7 +531966,7 @@
 +    
 +    
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EndElementEvent.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EndElementEvent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EndElementEvent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EndElementEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EndElementEvent.java
@@ -532095,7 +532095,7 @@
 +    }
 +    
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java
@@ -532250,7 +532250,7 @@
 +        writer.write(">");
 +    }        
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EntityReferenceEvent.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EntityReferenceEvent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EntityReferenceEvent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EntityReferenceEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/EntityReferenceEvent.java
@@ -532335,7 +532335,7 @@
 +    
 +    
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/LocationImpl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/LocationImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/LocationImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/LocationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/LocationImpl.java
@@ -532424,7 +532424,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NamedEvent.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NamedEvent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NamedEvent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NamedEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NamedEvent.java
@@ -532512,7 +532512,7 @@
 +    }    
 +    
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NamespaceImpl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NamespaceImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NamespaceImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NamespaceImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NamespaceImpl.java
@@ -532618,7 +532618,7 @@
 +        return true;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java
@@ -532726,7 +532726,7 @@
 +        writer.write('>');
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java
@@ -532832,7 +532832,7 @@
 +    }
 +    
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/StartDocumentEvent.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/StartDocumentEvent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/StartDocumentEvent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/StartDocumentEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/StartDocumentEvent.java
@@ -533010,7 +533010,7 @@
 +        writer.write(toString());
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/StartElementEvent.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/StartElementEvent.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/StartElementEvent.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/StartElementEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/StartElementEvent.java
@@ -533246,7 +533246,7 @@
 +    }
 +    
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java
@@ -533508,7 +533508,7 @@
 +                xmlr.getPrefix());
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java
@@ -533714,25 +533714,25 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLEventFactory b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLEventFactory
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLEventFactory openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLEventFactory
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLEventFactory
 @@ -0,0 +1,1 @@
 +com.sun.xml.internal.stream.events.XMLEventFactoryImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLInputFactory b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLInputFactory
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLInputFactory openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLInputFactory
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLInputFactory
 @@ -0,0 +1,1 @@
 +com.sun.xml.internal.stream.XMLInputFactoryImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLOutputFactory b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLOutputFactory
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLOutputFactory openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLOutputFactory
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/javax.xml.stream.XMLOutputFactory
 @@ -0,0 +1,1 @@
 +com.sun.xml.internal.stream.XMLOutputFactoryImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/BufferAllocator.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/BufferAllocator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/BufferAllocator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/BufferAllocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/BufferAllocator.java
@@ -533858,7 +533858,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/ReadOnlyIterator.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/ReadOnlyIterator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/ReadOnlyIterator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/ReadOnlyIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/ReadOnlyIterator.java
@@ -533930,7 +533930,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java
@@ -533988,7 +533988,7 @@
 +        return (BufferAllocator) bAllocatorRef.get();
 +   }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java
@@ -534142,7 +534142,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/WriterUtility.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/WriterUtility.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/WriterUtility.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/WriterUtility.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/WriterUtility.java
@@ -534400,7 +534400,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java
@@ -535147,7 +535147,7 @@
 +	}
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java
@@ -535413,7 +535413,7 @@
 +    }
 +
 +}//XMLEventWriterImpl
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLOutputSource.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLOutputSource.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLOutputSource.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLOutputSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLOutputSource.java
@@ -535463,7 +535463,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java
@@ -537652,7 +537652,7 @@
 +        return (this == obj);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLWriter.java b/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLWriter.java
+diff --git a/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLWriter.java openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/com/sun/xml/internal/stream/writers/XMLWriter.java
@@ -537917,7 +537917,7 @@
 +        if (writer == null)throw new IOException("Stream closed");
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/XMLConstants.java b/drop_included/jaxp_src/src/javax/xml/XMLConstants.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/XMLConstants.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/XMLConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/XMLConstants.java
@@ -538116,7 +538116,7 @@
 +	 */    
 +	public static final String FEATURE_SECURE_PROCESSING = "http://javax.xml.XMLConstants/feature/secure-processing";
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeConfigurationException.java b/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeConfigurationException.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeConfigurationException.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeConfigurationException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeConfigurationException.java
@@ -538200,7 +538200,7 @@
 +                super(cause);
 +        }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeConstants.java b/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeConstants.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeConstants.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeConstants.java
@@ -538479,7 +538479,7 @@
 +        public static final int MIN_TIMEZONE_OFFSET = 14 * 60;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeFactory.java b/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeFactory.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeFactory.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/DatatypeFactory.java
@@ -539548,7 +539548,7 @@
 +		);
 +	}
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/Duration.java b/drop_included/jaxp_src/src/javax/xml/datatype/Duration.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/Duration.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/Duration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/Duration.java
@@ -540541,7 +540541,7 @@
 +        return cal.getTime().getTime();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/FactoryFinder.java b/drop_included/jaxp_src/src/javax/xml/datatype/FactoryFinder.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/FactoryFinder.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/FactoryFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/FactoryFinder.java
@@ -540873,7 +540873,7 @@
 +    }
 +    
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/SecuritySupport.java b/drop_included/jaxp_src/src/javax/xml/datatype/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/SecuritySupport.java
@@ -540984,7 +540984,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/XMLGregorianCalendar.java b/drop_included/jaxp_src/src/javax/xml/datatype/XMLGregorianCalendar.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/XMLGregorianCalendar.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/XMLGregorianCalendar.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/XMLGregorianCalendar.java
@@ -542048,7 +542048,7 @@
 +     */
 +   public abstract Object clone();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/package.html b/drop_included/jaxp_src/src/javax/xml/datatype/package.html
+diff --git a/drop_included/jaxp_src/src/javax/xml/datatype/package.html openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/datatype/package.html
@@ -542223,7 +542223,7 @@
 +
 +	</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/javax/xml/namespace/NamespaceContext.java b/drop_included/jaxp_src/src/javax/xml/namespace/NamespaceContext.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/namespace/NamespaceContext.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/namespace/NamespaceContext.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/namespace/NamespaceContext.java
@@ -542516,7 +542516,7 @@
 +     */
 +    Iterator getPrefixes(String namespaceURI);
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/namespace/QName.java b/drop_included/jaxp_src/src/javax/xml/namespace/QName.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/namespace/QName.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/namespace/QName.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/namespace/QName.java
@@ -543037,7 +543037,7 @@
 +            XMLConstants.DEFAULT_NS_PREFIX);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/namespace/package.html b/drop_included/jaxp_src/src/javax/xml/namespace/package.html
+diff --git a/drop_included/jaxp_src/src/javax/xml/namespace/package.html openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/namespace/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/namespace/package.html
@@ -543096,7 +543096,7 @@
 +
 +</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/DocumentBuilder.java b/drop_included/jaxp_src/src/javax/xml/parsers/DocumentBuilder.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/DocumentBuilder.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/DocumentBuilder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/DocumentBuilder.java
@@ -543449,7 +543449,7 @@
 +            );
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/DocumentBuilderFactory.java b/drop_included/jaxp_src/src/javax/xml/parsers/DocumentBuilderFactory.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/DocumentBuilderFactory.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/DocumentBuilderFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/DocumentBuilderFactory.java
@@ -544068,7 +544068,7 @@
 +            );
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/FactoryConfigurationError.java b/drop_included/jaxp_src/src/javax/xml/parsers/FactoryConfigurationError.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/FactoryConfigurationError.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/FactoryConfigurationError.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/FactoryConfigurationError.java
@@ -544208,7 +544208,7 @@
 +        return exception;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/FactoryFinder.java b/drop_included/jaxp_src/src/javax/xml/parsers/FactoryFinder.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/FactoryFinder.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/FactoryFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/FactoryFinder.java
@@ -544540,7 +544540,7 @@
 +    }
 +    
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/ParserConfigurationException.java b/drop_included/jaxp_src/src/javax/xml/parsers/ParserConfigurationException.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/ParserConfigurationException.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/ParserConfigurationException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/ParserConfigurationException.java
@@ -544601,7 +544601,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/SAXParser.java b/drop_included/jaxp_src/src/javax/xml/parsers/SAXParser.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/SAXParser.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/SAXParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/SAXParser.java
@@ -545138,7 +545138,7 @@
 +            );
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/SAXParserFactory.java b/drop_included/jaxp_src/src/javax/xml/parsers/SAXParserFactory.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/SAXParserFactory.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/SAXParserFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/SAXParserFactory.java
@@ -545616,7 +545616,7 @@
 +    }
 +}
 +
-diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/SecuritySupport.java b/drop_included/jaxp_src/src/javax/xml/parsers/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/SecuritySupport.java
@@ -545731,7 +545731,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/package.html b/drop_included/jaxp_src/src/javax/xml/parsers/package.html
+diff --git a/drop_included/jaxp_src/src/javax/xml/parsers/package.html openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/parsers/package.html
@@ -545787,7 +545787,7 @@
 +	</ul>
 +</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/EventFilter.java b/drop_included/jaxp_src/src/javax/xml/stream/EventFilter.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/EventFilter.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/EventFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/EventFilter.java
@@ -545842,7 +545842,7 @@
 +   */
 +  public boolean accept(XMLEvent event);
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/FactoryConfigurationError.java b/drop_included/jaxp_src/src/javax/xml/stream/FactoryConfigurationError.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/FactoryConfigurationError.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/FactoryConfigurationError.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/FactoryConfigurationError.java
@@ -545972,7 +545972,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/FactoryFinder.java b/drop_included/jaxp_src/src/javax/xml/stream/FactoryFinder.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/FactoryFinder.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/FactoryFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/FactoryFinder.java
@@ -546336,7 +546336,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/Location.java b/drop_included/jaxp_src/src/javax/xml/stream/Location.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/Location.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/Location.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/Location.java
@@ -546419,7 +546419,7 @@
 +  public String getSystemId();
 +}
 +
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/SecuritySupport.java b/drop_included/jaxp_src/src/javax/xml/stream/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/SecuritySupport.java
@@ -546534,7 +546534,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/StreamFilter.java b/drop_included/jaxp_src/src/javax/xml/stream/StreamFilter.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/StreamFilter.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/StreamFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/StreamFilter.java
@@ -546590,7 +546590,7 @@
 +   */
 +  public boolean accept(XMLStreamReader reader);
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLEventFactory.java b/drop_included/jaxp_src/src/javax/xml/stream/XMLEventFactory.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLEventFactory.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLEventFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLEventFactory.java
@@ -547011,7 +547011,7 @@
 +
 +
 +
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLEventReader.java b/drop_included/jaxp_src/src/javax/xml/stream/XMLEventReader.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLEventReader.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLEventReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLEventReader.java
@@ -547122,7 +547122,7 @@
 +   */
 +  public void close() throws XMLStreamException;
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLEventWriter.java b/drop_included/jaxp_src/src/javax/xml/stream/XMLEventWriter.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLEventWriter.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLEventWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLEventWriter.java
@@ -547383,7 +547383,7 @@
 +
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLInputFactory.java b/drop_included/jaxp_src/src/javax/xml/stream/XMLInputFactory.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLInputFactory.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLInputFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLInputFactory.java
@@ -547833,7 +547833,7 @@
 +
 +}
 +
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLOutputFactory.java b/drop_included/jaxp_src/src/javax/xml/stream/XMLOutputFactory.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLOutputFactory.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLOutputFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLOutputFactory.java
@@ -548159,7 +548159,7 @@
 +
 +
 +
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLReporter.java b/drop_included/jaxp_src/src/javax/xml/stream/XMLReporter.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLReporter.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLReporter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLReporter.java
@@ -548230,7 +548230,7 @@
 +            throws XMLStreamException;
 +}
 +
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLResolver.java b/drop_included/jaxp_src/src/javax/xml/stream/XMLResolver.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLResolver.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLResolver.java
@@ -548296,7 +548296,7 @@
 +    throws XMLStreamException;
 +}
 +
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamConstants.java b/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamConstants.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamConstants.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamConstants.java
@@ -548431,7 +548431,7 @@
 +
 +
 +
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamException.java b/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamException.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamException.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamException.java
@@ -548566,7 +548566,7 @@
 +  }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamReader.java b/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamReader.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamReader.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamReader.java
@@ -549275,7 +549275,7 @@
 +   */
 +  public String getPIData();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamWriter.java b/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamWriter.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamWriter.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamWriter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/XMLStreamWriter.java
@@ -549808,7 +549808,7 @@
 +  public Object getProperty(java.lang.String name) throws IllegalArgumentException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/Attribute.java b/drop_included/jaxp_src/src/javax/xml/stream/events/Attribute.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/Attribute.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/Attribute.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/Attribute.java
@@ -549882,7 +549882,7 @@
 +  public boolean isSpecified();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/Characters.java b/drop_included/jaxp_src/src/javax/xml/stream/events/Characters.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/Characters.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/Characters.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/Characters.java
@@ -549963,7 +549963,7 @@
 +  public boolean isIgnorableWhiteSpace();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/Comment.java b/drop_included/jaxp_src/src/javax/xml/stream/events/Comment.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/Comment.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/Comment.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/Comment.java
@@ -550013,7 +550013,7 @@
 +   */
 +  public String getText();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/DTD.java b/drop_included/jaxp_src/src/javax/xml/stream/events/DTD.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/DTD.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/DTD.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/DTD.java
@@ -550092,7 +550092,7 @@
 +   */
 +  List getEntities();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/EndDocument.java b/drop_included/jaxp_src/src/javax/xml/stream/events/EndDocument.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/EndDocument.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/EndDocument.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/EndDocument.java
@@ -550139,7 +550139,7 @@
 +   * No methods are defined in this interface.
 +   */
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/EndElement.java b/drop_included/jaxp_src/src/javax/xml/stream/events/EndElement.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/EndElement.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/EndElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/EndElement.java
@@ -550203,7 +550203,7 @@
 +  public Iterator getNamespaces();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/EntityDeclaration.java b/drop_included/jaxp_src/src/javax/xml/stream/events/EntityDeclaration.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/EntityDeclaration.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/EntityDeclaration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/EntityDeclaration.java
@@ -550288,7 +550288,7 @@
 +  String getBaseURI();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/EntityReference.java b/drop_included/jaxp_src/src/javax/xml/stream/events/EntityReference.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/EntityReference.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/EntityReference.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/EntityReference.java
@@ -550355,7 +550355,7 @@
 +   */
 +  String getName();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/Namespace.java b/drop_included/jaxp_src/src/javax/xml/stream/events/Namespace.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/Namespace.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/Namespace.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/Namespace.java
@@ -550419,7 +550419,7 @@
 +   */
 +  public boolean isDefaultNamespaceDeclaration();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/NotationDeclaration.java b/drop_included/jaxp_src/src/javax/xml/stream/events/NotationDeclaration.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/NotationDeclaration.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/NotationDeclaration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/NotationDeclaration.java
@@ -550482,7 +550482,7 @@
 +   */
 +  String getSystemId();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/ProcessingInstruction.java b/drop_included/jaxp_src/src/javax/xml/stream/events/ProcessingInstruction.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/ProcessingInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/ProcessingInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/ProcessingInstruction.java
@@ -550539,7 +550539,7 @@
 +   */
 +  public String getData();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/StartDocument.java b/drop_included/jaxp_src/src/javax/xml/stream/events/StartDocument.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/StartDocument.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/StartDocument.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/StartDocument.java
@@ -550618,7 +550618,7 @@
 +   */
 +  public String getVersion();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/StartElement.java b/drop_included/jaxp_src/src/javax/xml/stream/events/StartElement.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/StartElement.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/StartElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/StartElement.java
@@ -550740,7 +550740,7 @@
 +   */
 +  public String getNamespaceURI(String prefix);
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/XMLEvent.java b/drop_included/jaxp_src/src/javax/xml/stream/events/XMLEvent.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/events/XMLEvent.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/XMLEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/events/XMLEvent.java
@@ -550923,7 +550923,7 @@
 +    throws javax.xml.stream.XMLStreamException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/util/EventReaderDelegate.java b/drop_included/jaxp_src/src/javax/xml/stream/util/EventReaderDelegate.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/util/EventReaderDelegate.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/util/EventReaderDelegate.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/util/EventReaderDelegate.java
@@ -551062,7 +551062,7 @@
 +    reader.remove();
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/util/StreamReaderDelegate.java b/drop_included/jaxp_src/src/javax/xml/stream/util/StreamReaderDelegate.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/util/StreamReaderDelegate.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/util/StreamReaderDelegate.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/util/StreamReaderDelegate.java
@@ -551354,7 +551354,7 @@
 +    return reader.getProperty(name);
 +  }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/util/XMLEventAllocator.java b/drop_included/jaxp_src/src/javax/xml/stream/util/XMLEventAllocator.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/util/XMLEventAllocator.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/util/XMLEventAllocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/util/XMLEventAllocator.java
@@ -551441,7 +551441,7 @@
 +    throws XMLStreamException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/stream/util/XMLEventConsumer.java b/drop_included/jaxp_src/src/javax/xml/stream/util/XMLEventConsumer.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/stream/util/XMLEventConsumer.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/util/XMLEventConsumer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/stream/util/XMLEventConsumer.java
@@ -551504,7 +551504,7 @@
 +  public void add(XMLEvent event)
 +    throws XMLStreamException;
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/ErrorListener.java b/drop_included/jaxp_src/src/javax/xml/transform/ErrorListener.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/ErrorListener.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/ErrorListener.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/ErrorListener.java
@@ -551626,7 +551626,7 @@
 +    public abstract void fatalError(TransformerException exception)
 +        throws TransformerException;
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/FactoryFinder.java b/drop_included/jaxp_src/src/javax/xml/transform/FactoryFinder.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/FactoryFinder.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/FactoryFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/FactoryFinder.java
@@ -551958,7 +551958,7 @@
 +    }
 +    
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/OutputKeys.java b/drop_included/jaxp_src/src/javax/xml/transform/OutputKeys.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/OutputKeys.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/OutputKeys.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/OutputKeys.java
@@ -552163,7 +552163,7 @@
 +     */
 +    public static final String MEDIA_TYPE = "media-type";
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/Result.java b/drop_included/jaxp_src/src/javax/xml/transform/Result.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/Result.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/Result.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/Result.java
@@ -552254,7 +552254,7 @@
 +     */
 +    public String getSystemId();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/SecuritySupport.java b/drop_included/jaxp_src/src/javax/xml/transform/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/SecuritySupport.java
@@ -552367,7 +552367,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/Source.java b/drop_included/jaxp_src/src/javax/xml/transform/Source.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/Source.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/Source.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/Source.java
@@ -552425,7 +552425,7 @@
 +     */
 +    public String getSystemId();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/SourceLocator.java b/drop_included/jaxp_src/src/javax/xml/transform/SourceLocator.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/SourceLocator.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/SourceLocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/SourceLocator.java
@@ -552526,7 +552526,7 @@
 +     */
 +    public int getColumnNumber();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/Templates.java b/drop_included/jaxp_src/src/javax/xml/transform/Templates.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/Templates.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/Templates.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/Templates.java
@@ -552613,7 +552613,7 @@
 +     */
 +    Properties getOutputProperties();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/Transformer.java b/drop_included/jaxp_src/src/javax/xml/transform/Transformer.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/Transformer.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/Transformer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/Transformer.java
@@ -552957,7 +552957,7 @@
 +     */
 +    public abstract ErrorListener getErrorListener();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/TransformerConfigurationException.java b/drop_included/jaxp_src/src/javax/xml/transform/TransformerConfigurationException.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/TransformerConfigurationException.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/TransformerConfigurationException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/TransformerConfigurationException.java
@@ -553064,7 +553064,7 @@
 +        super(message, locator, e);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/TransformerException.java b/drop_included/jaxp_src/src/javax/xml/transform/TransformerException.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/TransformerException.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/TransformerException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/TransformerException.java
@@ -553439,7 +553439,7 @@
 +        s.flush();
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/TransformerFactory.java b/drop_included/jaxp_src/src/javax/xml/transform/TransformerFactory.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/TransformerFactory.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/TransformerFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/TransformerFactory.java
@@ -553826,7 +553826,7 @@
 +    public abstract ErrorListener getErrorListener();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/TransformerFactoryConfigurationError.java b/drop_included/jaxp_src/src/javax/xml/transform/TransformerFactoryConfigurationError.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/TransformerFactoryConfigurationError.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/TransformerFactoryConfigurationError.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/TransformerFactoryConfigurationError.java
@@ -553965,7 +553965,7 @@
 +        return exception;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/URIResolver.java b/drop_included/jaxp_src/src/javax/xml/transform/URIResolver.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/URIResolver.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/URIResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/URIResolver.java
@@ -554020,7 +554020,7 @@
 +    public Source resolve(String href, String base)
 +        throws TransformerException;
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMLocator.java b/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMLocator.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMLocator.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMLocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMLocator.java
@@ -554074,7 +554074,7 @@
 +     */
 +    public Node getOriginatingNode();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMResult.java b/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMResult.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMResult.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMResult.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMResult.java
@@ -554441,7 +554441,7 @@
 +     */
 +    private String systemId = null;
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMSource.java b/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMSource.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMSource.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/dom/DOMSource.java
@@ -554583,7 +554583,7 @@
 +        return this.systemID;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/dom/package.html b/drop_included/jaxp_src/src/javax/xml/transform/dom/package.html
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/dom/package.html openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/dom/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/dom/package.html
@@ -554658,7 +554658,7 @@
 +be tested with an instanceof. </p>
 +</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/overview.html b/drop_included/jaxp_src/src/javax/xml/transform/overview.html
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/overview.html openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/overview.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/overview.html
@@ -554954,7 +554954,7 @@
 +
 +</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/package.html b/drop_included/jaxp_src/src/javax/xml/transform/package.html
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/package.html openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/package.html
@@ -555192,7 +555192,7 @@
 +
 +</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXResult.java b/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXResult.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXResult.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXResult.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXResult.java
@@ -555341,7 +555341,7 @@
 +     */
 +    private String systemId;
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXSource.java b/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXSource.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXSource.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXSource.java
@@ -555555,7 +555555,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXTransformerFactory.java b/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXTransformerFactory.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXTransformerFactory.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXTransformerFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/sax/SAXTransformerFactory.java
@@ -555710,7 +555710,7 @@
 +    public abstract XMLFilter newXMLFilter(Templates templates)
 +        throws TransformerConfigurationException;
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/sax/TemplatesHandler.java b/drop_included/jaxp_src/src/javax/xml/transform/sax/TemplatesHandler.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/sax/TemplatesHandler.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/sax/TemplatesHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/sax/TemplatesHandler.java
@@ -555783,7 +555783,7 @@
 +     */
 +    public String getSystemId();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/sax/TransformerHandler.java b/drop_included/jaxp_src/src/javax/xml/transform/sax/TransformerHandler.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/sax/TransformerHandler.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/sax/TransformerHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/sax/TransformerHandler.java
@@ -555864,7 +555864,7 @@
 +     */
 +    public Transformer getTransformer();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/sax/package.html b/drop_included/jaxp_src/src/javax/xml/transform/sax/package.html
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/sax/package.html openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/sax/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/sax/package.html
@@ -555973,7 +555973,7 @@
 +  reader in the chain.</p>
 +</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/stax/StAXResult.java b/drop_included/jaxp_src/src/javax/xml/transform/stax/StAXResult.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/stax/StAXResult.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/stax/StAXResult.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/stax/StAXResult.java
@@ -556161,7 +556161,7 @@
 +        return null;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/stax/StAXSource.java b/drop_included/jaxp_src/src/javax/xml/transform/stax/StAXSource.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/stax/StAXSource.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/stax/StAXSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/stax/StAXSource.java
@@ -556402,7 +556402,7 @@
 +        return systemId;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/stax/package.html b/drop_included/jaxp_src/src/javax/xml/transform/stax/package.html
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/stax/package.html openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/stax/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/stax/package.html
@@ -556480,7 +556480,7 @@
 +
 +	</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/stream/StreamResult.java b/drop_included/jaxp_src/src/javax/xml/transform/stream/StreamResult.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/stream/StreamResult.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/stream/StreamResult.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/stream/StreamResult.java
@@ -556688,7 +556688,7 @@
 +     */
 +    private Writer writer;
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/stream/StreamSource.java b/drop_included/jaxp_src/src/javax/xml/transform/stream/StreamSource.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/stream/StreamSource.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/stream/StreamSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/stream/StreamSource.java
@@ -556977,7 +556977,7 @@
 +     */
 +    private Reader reader;
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/transform/stream/package.html b/drop_included/jaxp_src/src/javax/xml/transform/stream/package.html
+diff --git a/drop_included/jaxp_src/src/javax/xml/transform/stream/package.html openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/stream/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/transform/stream/package.html
@@ -557046,7 +557046,7 @@
 +	 XML from a StringReader.</p>
 +</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/javax/xml/validation/Schema.java b/drop_included/jaxp_src/src/javax/xml/validation/Schema.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/validation/Schema.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/Schema.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/Schema.java
@@ -557155,7 +557155,7 @@
 +     */
 +    public abstract ValidatorHandler newValidatorHandler();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactory.java b/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactory.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactory.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactory.java
@@ -557913,7 +557913,7 @@
 +     */
 +    public abstract Schema newSchema() throws SAXException;
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactoryFinder.java b/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactoryFinder.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactoryFinder.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactoryFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactoryFinder.java
@@ -558456,7 +558456,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactoryLoader.java b/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactoryLoader.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactoryLoader.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactoryLoader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/SchemaFactoryLoader.java
@@ -558529,7 +558529,7 @@
 +     */
 +    public abstract SchemaFactory newFactory(String schemaLanguage);
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/validation/SecuritySupport.java b/drop_included/jaxp_src/src/javax/xml/validation/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/validation/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/SecuritySupport.java
@@ -558697,7 +558697,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/validation/TypeInfoProvider.java b/drop_included/jaxp_src/src/javax/xml/validation/TypeInfoProvider.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/validation/TypeInfoProvider.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/TypeInfoProvider.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/TypeInfoProvider.java
@@ -558899,7 +558899,7 @@
 +     */
 +    public abstract boolean isSpecified(int index);
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/validation/Validator.java b/drop_included/jaxp_src/src/javax/xml/validation/Validator.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/validation/Validator.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/Validator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/Validator.java
@@ -559409,7 +559409,7 @@
 +        throw new SAXNotRecognizedException(name);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/validation/ValidatorHandler.java b/drop_included/jaxp_src/src/javax/xml/validation/ValidatorHandler.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/validation/ValidatorHandler.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/ValidatorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/ValidatorHandler.java
@@ -559899,7 +559899,7 @@
 +        throw new SAXNotRecognizedException(name);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/validation/package.html b/drop_included/jaxp_src/src/javax/xml/validation/package.html
+diff --git a/drop_included/jaxp_src/src/javax/xml/validation/package.html openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/validation/package.html
@@ -560028,7 +560028,7 @@
 +        </p>
 +	</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/SecuritySupport.java b/drop_included/jaxp_src/src/javax/xml/xpath/SecuritySupport.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/SecuritySupport.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/SecuritySupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/SecuritySupport.java
@@ -560193,7 +560193,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPath.java b/drop_included/jaxp_src/src/javax/xml/xpath/XPath.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPath.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPath.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPath.java
@@ -560517,7 +560517,7 @@
 +    public String evaluate(String expression, InputSource source)
 +        throws XPathExpressionException;
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathConstants.java b/drop_included/jaxp_src/src/javax/xml/xpath/XPathConstants.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathConstants.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathConstants.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathConstants.java
@@ -560606,7 +560606,7 @@
 +     */
 +    public static final String DOM_OBJECT_MODEL = "http://java.sun.com/jaxp/xpath/dom";
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathException.java b/drop_included/jaxp_src/src/javax/xml/xpath/XPathException.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathException.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathException.java
@@ -560742,7 +560742,7 @@
 +        super.printStackTrace(s);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathExpression.java b/drop_included/jaxp_src/src/javax/xml/xpath/XPathExpression.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathExpression.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathExpression.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathExpression.java
@@ -560947,7 +560947,7 @@
 +    public String evaluate(InputSource source)
 +        throws XPathExpressionException;
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathExpressionException.java b/drop_included/jaxp_src/src/javax/xml/xpath/XPathExpressionException.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathExpressionException.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathExpressionException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathExpressionException.java
@@ -561026,7 +561026,7 @@
 +        super(cause);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactory.java b/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactory.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactory.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactory.java
@@ -561415,7 +561415,7 @@
 +    */
 +    public abstract XPath newXPath();
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactoryConfigurationException.java b/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactoryConfigurationException.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactoryConfigurationException.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactoryConfigurationException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactoryConfigurationException.java
@@ -561493,7 +561493,7 @@
 +        super(cause);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactoryFinder.java b/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactoryFinder.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactoryFinder.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactoryFinder.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathFactoryFinder.java
@@ -562014,7 +562014,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunction.java b/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunction.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunction.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunction.java
@@ -562075,7 +562075,7 @@
 +  public Object evaluate(List args)
 +    throws XPathFunctionException;
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunctionException.java b/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunctionException.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunctionException.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunctionException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunctionException.java
@@ -562152,7 +562152,7 @@
 +        super(cause);
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunctionResolver.java b/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunctionResolver.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunctionResolver.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunctionResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathFunctionResolver.java
@@ -562223,7 +562223,7 @@
 +   */
 +  public XPathFunction resolveFunction(QName functionName, int arity);
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathVariableResolver.java b/drop_included/jaxp_src/src/javax/xml/xpath/XPathVariableResolver.java
+diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/XPathVariableResolver.java openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathVariableResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/XPathVariableResolver.java
@@ -562286,7 +562286,7 @@
 +   */
 +  public Object resolveVariable(QName variableName);
 +}
-diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/package.html b/drop_included/jaxp_src/src/javax/xml/xpath/package.html
+diff --git a/drop_included/jaxp_src/src/javax/xml/xpath/package.html openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/javax/xml/xpath/package.html
@@ -562573,7 +562573,7 @@
 +</ul>		
 +</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Attr.java b/drop_included/jaxp_src/src/org/w3c/dom/Attr.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Attr.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Attr.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Attr.java
@@ -562882,7 +562882,7 @@
 +    public boolean isId();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/CDATASection.java b/drop_included/jaxp_src/src/org/w3c/dom/CDATASection.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/CDATASection.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/CDATASection.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/CDATASection.java
@@ -562970,7 +562970,7 @@
 + */
 +public interface CDATASection extends Text {
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/CharacterData.java b/drop_included/jaxp_src/src/org/w3c/dom/CharacterData.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/CharacterData.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/CharacterData.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/CharacterData.java
@@ -563157,7 +563157,7 @@
 +                            throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Comment.java b/drop_included/jaxp_src/src/org/w3c/dom/Comment.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Comment.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Comment.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Comment.java
@@ -563221,7 +563221,7 @@
 + */
 +public interface Comment extends CharacterData {
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMConfiguration.java b/drop_included/jaxp_src/src/org/w3c/dom/DOMConfiguration.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMConfiguration.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMConfiguration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMConfiguration.java
@@ -563668,7 +563668,7 @@
 +    public DOMStringList getParameterNames();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMError.java b/drop_included/jaxp_src/src/org/w3c/dom/DOMError.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMError.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMError.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMError.java
@@ -563789,7 +563789,7 @@
 +    public DOMLocator getLocation();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMErrorHandler.java b/drop_included/jaxp_src/src/org/w3c/dom/DOMErrorHandler.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMErrorHandler.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMErrorHandler.java
@@ -563868,7 +563868,7 @@
 +    public boolean handleError(DOMError error);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMException.java b/drop_included/jaxp_src/src/org/w3c/dom/DOMException.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMException.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMException.java
@@ -564035,7 +564035,7 @@
 +    // Added serialVersionUID to preserve binary compatibility
 +    static final long serialVersionUID = 6627732366795969916L;
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementation.java b/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementation.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementation.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementation.java
@@ -564205,7 +564205,7 @@
 +                             String version);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementationList.java b/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementationList.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementationList.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementationList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementationList.java
@@ -564282,7 +564282,7 @@
 +    public int getLength();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementationSource.java b/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementationSource.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementationSource.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementationSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMImplementationSource.java
@@ -564374,7 +564374,7 @@
 +    public DOMImplementationList getDOMImplementationList(String features);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMLocator.java b/drop_included/jaxp_src/src/org/w3c/dom/DOMLocator.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMLocator.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMLocator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMLocator.java
@@ -564466,7 +564466,7 @@
 +    public String getUri();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMStringList.java b/drop_included/jaxp_src/src/org/w3c/dom/DOMStringList.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DOMStringList.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMStringList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DOMStringList.java
@@ -564550,7 +564550,7 @@
 +    public boolean contains(String str);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Document.java b/drop_included/jaxp_src/src/org/w3c/dom/Document.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Document.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Document.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Document.java
@@ -565399,7 +565399,7 @@
 +                           throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DocumentFragment.java b/drop_included/jaxp_src/src/org/w3c/dom/DocumentFragment.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DocumentFragment.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DocumentFragment.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DocumentFragment.java
@@ -565486,7 +565486,7 @@
 + */
 +public interface DocumentFragment extends Node {
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DocumentType.java b/drop_included/jaxp_src/src/org/w3c/dom/DocumentType.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/DocumentType.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DocumentType.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/DocumentType.java
@@ -565603,7 +565603,7 @@
 +    public String getInternalSubset();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Element.java b/drop_included/jaxp_src/src/org/w3c/dom/Element.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Element.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Element.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Element.java
@@ -566076,7 +566076,7 @@
 +                                   throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Entity.java b/drop_included/jaxp_src/src/org/w3c/dom/Entity.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Entity.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Entity.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Entity.java
@@ -566200,7 +566200,7 @@
 +    public String getXmlVersion();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/EntityReference.java b/drop_included/jaxp_src/src/org/w3c/dom/EntityReference.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/EntityReference.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/EntityReference.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/EntityReference.java
@@ -566277,7 +566277,7 @@
 + */
 +public interface EntityReference extends Node {
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/NameList.java b/drop_included/jaxp_src/src/org/w3c/dom/NameList.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/NameList.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/NameList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/NameList.java
@@ -566379,7 +566379,7 @@
 +                              String name);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/NamedNodeMap.java b/drop_included/jaxp_src/src/org/w3c/dom/NamedNodeMap.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/NamedNodeMap.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/NamedNodeMap.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/NamedNodeMap.java
@@ -566596,7 +566596,7 @@
 +                                  throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Node.java b/drop_included/jaxp_src/src/org/w3c/dom/Node.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Node.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Node.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Node.java
@@ -567554,7 +567554,7 @@
 +    public Object getUserData(String key);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/NodeList.java b/drop_included/jaxp_src/src/org/w3c/dom/NodeList.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/NodeList.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/NodeList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/NodeList.java
@@ -567629,7 +567629,7 @@
 +    public int getLength();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Notation.java b/drop_included/jaxp_src/src/org/w3c/dom/Notation.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Notation.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Notation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Notation.java
@@ -567703,7 +567703,7 @@
 +    public String getSystemId();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ProcessingInstruction.java b/drop_included/jaxp_src/src/org/w3c/dom/ProcessingInstruction.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ProcessingInstruction.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ProcessingInstruction.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ProcessingInstruction.java
@@ -567788,7 +567788,7 @@
 +                                   throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Text.java b/drop_included/jaxp_src/src/org/w3c/dom/Text.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/Text.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Text.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/Text.java
@@ -567980,7 +567980,7 @@
 +                                 throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/TypeInfo.java b/drop_included/jaxp_src/src/org/w3c/dom/TypeInfo.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/TypeInfo.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/TypeInfo.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/TypeInfo.java
@@ -568199,7 +568199,7 @@
 +                                 int derivationMethod);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/UserDataHandler.java b/drop_included/jaxp_src/src/org/w3c/dom/UserDataHandler.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/UserDataHandler.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/UserDataHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/UserDataHandler.java
@@ -568305,7 +568305,7 @@
 +                       Node dst);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java b/drop_included/jaxp_src/src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java
@@ -568732,7 +568732,7 @@
 +	}
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSS2Properties.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSS2Properties.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSS2Properties.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSS2Properties.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSS2Properties.java
@@ -570543,7 +570543,7 @@
 +                                             throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSCharsetRule.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSSCharsetRule.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSCharsetRule.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSCharsetRule.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSCharsetRule.java
@@ -570628,7 +570628,7 @@
 +                           throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSFontFaceRule.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSSFontFaceRule.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSFontFaceRule.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSFontFaceRule.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSFontFaceRule.java
@@ -570690,7 +570690,7 @@
 +    public CSSStyleDeclaration getStyle();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSImportRule.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSSImportRule.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSImportRule.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSImportRule.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSImportRule.java
@@ -570768,7 +570768,7 @@
 +    public CSSStyleSheet getStyleSheet();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSMediaRule.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSSMediaRule.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSMediaRule.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSMediaRule.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSMediaRule.java
@@ -570878,7 +570878,7 @@
 +                           throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSPageRule.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSSPageRule.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSPageRule.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSPageRule.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSPageRule.java
@@ -570956,7 +570956,7 @@
 +    public CSSStyleDeclaration getStyle();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSPrimitiveValue.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSSPrimitiveValue.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSPrimitiveValue.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSPrimitiveValue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSPrimitiveValue.java
@@ -571286,7 +571286,7 @@
 +                                     throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSRule.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSSRule.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSRule.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSRule.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSRule.java
@@ -571417,7 +571417,7 @@
 +    public CSSRule getParentRule();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSRuleList.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSSRuleList.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSRuleList.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSRuleList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSRuleList.java
@@ -571494,7 +571494,7 @@
 +    public CSSRule item(int index);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleDeclaration.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleDeclaration.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleDeclaration.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleDeclaration.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleDeclaration.java
@@ -571690,7 +571690,7 @@
 +    public CSSRule getParentRule();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleRule.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleRule.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleRule.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleRule.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleRule.java
@@ -571771,7 +571771,7 @@
 +    public CSSStyleDeclaration getStyle();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleSheet.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleSheet.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleSheet.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleSheet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSStyleSheet.java
@@ -571890,7 +571890,7 @@
 +                           throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSUnknownRule.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSSUnknownRule.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSUnknownRule.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSUnknownRule.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSUnknownRule.java
@@ -571946,7 +571946,7 @@
 + */
 +public interface CSSUnknownRule extends CSSRule {
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSValue.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSSValue.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSValue.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSValue.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSValue.java
@@ -572051,7 +572051,7 @@
 +    public short getCssValueType();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSValueList.java b/drop_included/jaxp_src/src/org/w3c/dom/css/CSSValueList.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/CSSValueList.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSValueList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/CSSValueList.java
@@ -572131,7 +572131,7 @@
 +    public CSSValue item(int index);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/Counter.java b/drop_included/jaxp_src/src/org/w3c/dom/css/Counter.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/Counter.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/Counter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/Counter.java
@@ -572203,7 +572203,7 @@
 +    public String getSeparator();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/DOMImplementationCSS.java b/drop_included/jaxp_src/src/org/w3c/dom/css/DOMImplementationCSS.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/DOMImplementationCSS.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/DOMImplementationCSS.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/DOMImplementationCSS.java
@@ -572277,7 +572277,7 @@
 +                                             throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/DocumentCSS.java b/drop_included/jaxp_src/src/org/w3c/dom/css/DocumentCSS.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/DocumentCSS.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/DocumentCSS.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/DocumentCSS.java
@@ -572361,7 +572361,7 @@
 +                                                String pseudoElt);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/ElementCSSInlineStyle.java b/drop_included/jaxp_src/src/org/w3c/dom/css/ElementCSSInlineStyle.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/ElementCSSInlineStyle.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/ElementCSSInlineStyle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/ElementCSSInlineStyle.java
@@ -572427,7 +572427,7 @@
 +    public CSSStyleDeclaration getStyle();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/RGBColor.java b/drop_included/jaxp_src/src/org/w3c/dom/css/RGBColor.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/RGBColor.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/RGBColor.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/RGBColor.java
@@ -572508,7 +572508,7 @@
 +    public CSSPrimitiveValue getBlue();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/Rect.java b/drop_included/jaxp_src/src/org/w3c/dom/css/Rect.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/Rect.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/Rect.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/Rect.java
@@ -572586,7 +572586,7 @@
 +    public CSSPrimitiveValue getLeft();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/ViewCSS.java b/drop_included/jaxp_src/src/org/w3c/dom/css/ViewCSS.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/css/ViewCSS.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/ViewCSS.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/css/ViewCSS.java
@@ -572663,7 +572663,7 @@
 +                                                String pseudoElt);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/DocumentEvent.java b/drop_included/jaxp_src/src/org/w3c/dom/events/DocumentEvent.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/DocumentEvent.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/DocumentEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/DocumentEvent.java
@@ -572753,7 +572753,7 @@
 +                             throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/Event.java b/drop_included/jaxp_src/src/org/w3c/dom/events/Event.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/Event.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/Event.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/Event.java
@@ -572928,7 +572928,7 @@
 +                          boolean cancelableArg);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/EventException.java b/drop_included/jaxp_src/src/org/w3c/dom/events/EventException.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/EventException.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/EventException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/EventException.java
@@ -572998,7 +572998,7 @@
 +    public static final short UNSPECIFIED_EVENT_TYPE_ERR = 0;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/EventListener.java b/drop_included/jaxp_src/src/org/w3c/dom/events/EventListener.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/EventListener.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/EventListener.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/EventListener.java
@@ -573073,7 +573073,7 @@
 +    public void handleEvent(Event evt);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/EventTarget.java b/drop_included/jaxp_src/src/org/w3c/dom/events/EventTarget.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/EventTarget.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/EventTarget.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/EventTarget.java
@@ -573209,7 +573209,7 @@
 +                                 throws EventException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/MouseEvent.java b/drop_included/jaxp_src/src/org/w3c/dom/events/MouseEvent.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/MouseEvent.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/MouseEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/MouseEvent.java
@@ -573399,7 +573399,7 @@
 +                               EventTarget relatedTargetArg);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/MutationEvent.java b/drop_included/jaxp_src/src/org/w3c/dom/events/MutationEvent.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/MutationEvent.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/MutationEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/MutationEvent.java
@@ -573541,7 +573541,7 @@
 +                                  short attrChangeArg);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/UIEvent.java b/drop_included/jaxp_src/src/org/w3c/dom/events/UIEvent.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/events/UIEvent.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/UIEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/events/UIEvent.java
@@ -573633,7 +573633,7 @@
 +                            int detailArg);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAnchorElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAnchorElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAnchorElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAnchorElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAnchorElement.java
@@ -573778,7 +573778,7 @@
 +    public void focus();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAppletElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAppletElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAppletElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAppletElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAppletElement.java
@@ -573914,7 +573914,7 @@
 +    public void setWidth(String width);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAreaElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAreaElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAreaElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAreaElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLAreaElement.java
@@ -574026,7 +574026,7 @@
 +    public void setTarget(String target);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBRElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBRElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBRElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBRElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBRElement.java
@@ -574087,7 +574087,7 @@
 +    public void setClear(String clear);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBaseElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBaseElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBaseElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBaseElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBaseElement.java
@@ -574154,7 +574154,7 @@
 +    public void setTarget(String target);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBaseFontElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBaseFontElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBaseFontElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBaseFontElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBaseFontElement.java
@@ -574230,7 +574230,7 @@
 +    public void setSize(String size);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBodyElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBodyElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBodyElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBodyElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLBodyElement.java
@@ -574332,7 +574332,7 @@
 +    public void setVLink(String vLink);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLButtonElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLButtonElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLButtonElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLButtonElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLButtonElement.java
@@ -574432,7 +574432,7 @@
 +    public void setValue(String value);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLCollection.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLCollection.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLCollection.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLCollection.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLCollection.java
@@ -574522,7 +574522,7 @@
 +    public Node namedItem(String name);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDListElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDListElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDListElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDListElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDListElement.java
@@ -574583,7 +574583,7 @@
 +    public void setCompact(boolean compact);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDOMImplementation.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDOMImplementation.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDOMImplementation.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDOMImplementation.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDOMImplementation.java
@@ -574651,7 +574651,7 @@
 +    public HTMLDocument createHTMLDocument(String title);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDirectoryElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDirectoryElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDirectoryElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDirectoryElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDirectoryElement.java
@@ -574713,7 +574713,7 @@
 +    public void setCompact(boolean compact);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDivElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDivElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDivElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDivElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDivElement.java
@@ -574774,7 +574774,7 @@
 +    public void setAlign(String align);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDocument.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDocument.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDocument.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDocument.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLDocument.java
@@ -574962,7 +574962,7 @@
 +    public NodeList getElementsByName(String elementName);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLElement.java
@@ -575061,7 +575061,7 @@
 +    public void setClassName(String className);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFieldSetElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFieldSetElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFieldSetElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFieldSetElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFieldSetElement.java
@@ -575122,7 +575122,7 @@
 +    public HTMLFormElement getForm();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFontElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFontElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFontElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFontElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFontElement.java
@@ -575198,7 +575198,7 @@
 +    public void setSize(String size);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFormElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFormElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFormElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFormElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFormElement.java
@@ -575318,7 +575318,7 @@
 +    public void reset();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFrameElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFrameElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFrameElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFrameElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFrameElement.java
@@ -575437,7 +575437,7 @@
 +    public Document getContentDocument();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFrameSetElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFrameSetElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFrameSetElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFrameSetElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLFrameSetElement.java
@@ -575505,7 +575505,7 @@
 +    public void setRows(String rows);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHRElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHRElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHRElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHRElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHRElement.java
@@ -575588,7 +575588,7 @@
 +    public void setWidth(String width);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHeadElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHeadElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHeadElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHeadElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHeadElement.java
@@ -575649,7 +575649,7 @@
 +    public void setProfile(String profile);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHeadingElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHeadingElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHeadingElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHeadingElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHeadingElement.java
@@ -575711,7 +575711,7 @@
 +    public void setAlign(String align);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHtmlElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHtmlElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHtmlElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHtmlElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLHtmlElement.java
@@ -575773,7 +575773,7 @@
 +    public void setVersion(String version);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLIFrameElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLIFrameElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLIFrameElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLIFrameElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLIFrameElement.java
@@ -575905,7 +575905,7 @@
 +    public Document getContentDocument();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLImageElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLImageElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLImageElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLImageElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLImageElement.java
@@ -576048,7 +576048,7 @@
 +    public void setWidth(String width);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLInputElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLInputElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLInputElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLInputElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLInputElement.java
@@ -576278,7 +576278,7 @@
 +    public void click();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLIsIndexElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLIsIndexElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLIsIndexElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLIsIndexElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLIsIndexElement.java
@@ -576346,7 +576346,7 @@
 +    public void setPrompt(String prompt);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLIElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLIElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLIElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLIElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLIElement.java
@@ -576415,7 +576415,7 @@
 +    public void setValue(int value);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLabelElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLabelElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLabelElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLabelElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLabelElement.java
@@ -576490,7 +576490,7 @@
 +    public void setHtmlFor(String htmlFor);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLegendElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLegendElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLegendElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLegendElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLegendElement.java
@@ -576566,7 +576566,7 @@
 +    public void setAlign(String align);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLinkElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLinkElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLinkElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLinkElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLLinkElement.java
@@ -576683,7 +576683,7 @@
 +    public void setType(String type);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMapElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMapElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMapElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMapElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMapElement.java
@@ -576749,7 +576749,7 @@
 +    public void setName(String name);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMenuElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMenuElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMenuElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMenuElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMenuElement.java
@@ -576811,7 +576811,7 @@
 +    public void setCompact(boolean compact);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMetaElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMetaElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMetaElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMetaElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLMetaElement.java
@@ -576893,7 +576893,7 @@
 +    public void setScheme(String scheme);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLModElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLModElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLModElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLModElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLModElement.java
@@ -576962,7 +576962,7 @@
 +    public void setDateTime(String dateTime);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOListElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOListElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOListElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOListElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOListElement.java
@@ -577037,7 +577037,7 @@
 +    public void setType(String type);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLObjectElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLObjectElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLObjectElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLObjectElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLObjectElement.java
@@ -577230,7 +577230,7 @@
 +    public Document getContentDocument();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOptGroupElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOptGroupElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOptGroupElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOptGroupElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOptGroupElement.java
@@ -577299,7 +577299,7 @@
 +    public void setLabel(String label);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOptionElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOptionElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOptionElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOptionElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLOptionElement.java
@@ -577410,7 +577410,7 @@
 +    public void setValue(String value);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLParagraphElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLParagraphElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLParagraphElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLParagraphElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLParagraphElement.java
@@ -577471,7 +577471,7 @@
 +    public void setAlign(String align);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLParamElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLParamElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLParamElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLParamElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLParamElement.java
@@ -577555,7 +577555,7 @@
 +    public void setValueType(String valueType);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLPreElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLPreElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLPreElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLPreElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLPreElement.java
@@ -577616,7 +577616,7 @@
 +    public void setWidth(int width);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLQuoteElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLQuoteElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLQuoteElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLQuoteElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLQuoteElement.java
@@ -577678,7 +577678,7 @@
 +    public void setCite(String cite);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLScriptElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLScriptElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLScriptElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLScriptElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLScriptElement.java
@@ -577778,7 +577778,7 @@
 +    public void setType(String type);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLSelectElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLSelectElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLSelectElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLSelectElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLSelectElement.java
@@ -577945,7 +577945,7 @@
 +    public void focus();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLStyleElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLStyleElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLStyleElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLStyleElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLStyleElement.java
@@ -578020,7 +578020,7 @@
 +    public void setType(String type);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableCaptionElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableCaptionElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableCaptionElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableCaptionElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableCaptionElement.java
@@ -578081,7 +578081,7 @@
 +    public void setAlign(String align);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableCellElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableCellElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableCellElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableCellElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableCellElement.java
@@ -578240,7 +578240,7 @@
 +    public void setWidth(String width);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableColElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableColElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableColElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableColElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableColElement.java
@@ -578336,7 +578336,7 @@
 +    public void setWidth(String width);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableElement.java
@@ -578558,7 +578558,7 @@
 +                          throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableRowElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableRowElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableRowElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableRowElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableRowElement.java
@@ -578694,7 +578694,7 @@
 +                           throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableSectionElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableSectionElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableSectionElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableSectionElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTableSectionElement.java
@@ -578812,7 +578812,7 @@
 +                          throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTextAreaElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTextAreaElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTextAreaElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTextAreaElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTextAreaElement.java
@@ -578959,7 +578959,7 @@
 +    public void select();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTitleElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTitleElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTitleElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTitleElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLTitleElement.java
@@ -579019,7 +579019,7 @@
 +    public void setText(String text);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLUListElement.java b/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLUListElement.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLUListElement.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLUListElement.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/html/HTMLUListElement.java
@@ -579087,7 +579087,7 @@
 +    public void setType(String type);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/DOMImplementationLS.java b/drop_included/jaxp_src/src/org/w3c/dom/ls/DOMImplementationLS.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/DOMImplementationLS.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/DOMImplementationLS.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/DOMImplementationLS.java
@@ -579243,7 +579243,7 @@
 +    public LSOutput createLSOutput();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSException.java b/drop_included/jaxp_src/src/org/w3c/dom/ls/LSException.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSException.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSException.java
@@ -579324,7 +579324,7 @@
 +    public static final short SERIALIZE_ERR             = 82;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSInput.java b/drop_included/jaxp_src/src/org/w3c/dom/ls/LSInput.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSInput.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSInput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSInput.java
@@ -579576,7 +579576,7 @@
 +    public void setCertifiedText(boolean certifiedText);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSLoadEvent.java b/drop_included/jaxp_src/src/org/w3c/dom/ls/LSLoadEvent.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSLoadEvent.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSLoadEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSLoadEvent.java
@@ -579645,7 +579645,7 @@
 +    public LSInput getInput();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSOutput.java b/drop_included/jaxp_src/src/org/w3c/dom/ls/LSOutput.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSOutput.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSOutput.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSOutput.java
@@ -579785,7 +579785,7 @@
 +    public void setEncoding(String encoding);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSParser.java b/drop_included/jaxp_src/src/org/w3c/dom/ls/LSParser.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSParser.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSParser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSParser.java
@@ -580285,7 +580285,7 @@
 +    public void abort();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSParserFilter.java b/drop_included/jaxp_src/src/org/w3c/dom/ls/LSParserFilter.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSParserFilter.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSParserFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSParserFilter.java
@@ -580491,7 +580491,7 @@
 +    public int getWhatToShow();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSProgressEvent.java b/drop_included/jaxp_src/src/org/w3c/dom/ls/LSProgressEvent.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSProgressEvent.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSProgressEvent.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSProgressEvent.java
@@ -580573,7 +580573,7 @@
 +    public int getTotalSize();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSResourceResolver.java b/drop_included/jaxp_src/src/org/w3c/dom/ls/LSResourceResolver.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSResourceResolver.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSResourceResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSResourceResolver.java
@@ -580688,7 +580688,7 @@
 +                                   String baseURI);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSSerializer.java b/drop_included/jaxp_src/src/org/w3c/dom/ls/LSSerializer.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSSerializer.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSSerializer.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSSerializer.java
@@ -581158,7 +581158,7 @@
 +                                throws DOMException, LSException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSSerializerFilter.java b/drop_included/jaxp_src/src/org/w3c/dom/ls/LSSerializerFilter.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ls/LSSerializerFilter.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSSerializerFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ls/LSSerializerFilter.java
@@ -581255,7 +581255,7 @@
 +    public int getWhatToShow();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/package.html b/drop_included/jaxp_src/src/org/w3c/dom/package.html
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/package.html openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/package.html
@@ -581275,7 +581275,7 @@
 +@since JDK1.4
 +</body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ranges/DocumentRange.java b/drop_included/jaxp_src/src/org/w3c/dom/ranges/DocumentRange.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ranges/DocumentRange.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ranges/DocumentRange.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ranges/DocumentRange.java
@@ -581342,7 +581342,7 @@
 +    public Range createRange();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ranges/Range.java b/drop_included/jaxp_src/src/org/w3c/dom/ranges/Range.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ranges/Range.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ranges/Range.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ranges/Range.java
@@ -581792,7 +581792,7 @@
 +                       throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ranges/RangeException.java b/drop_included/jaxp_src/src/org/w3c/dom/ranges/RangeException.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ranges/RangeException.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ranges/RangeException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ranges/RangeException.java
@@ -581865,7 +581865,7 @@
 +    public static final short INVALID_NODE_TYPE_ERR     = 2;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ranges/package.html b/drop_included/jaxp_src/src/org/w3c/dom/ranges/package.html
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/ranges/package.html openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ranges/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/ranges/package.html
@@ -581981,7 +581981,7 @@
 +    </p>
 +  </body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/DocumentStyle.java b/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/DocumentStyle.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/DocumentStyle.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/DocumentStyle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/DocumentStyle.java
@@ -582049,7 +582049,7 @@
 +    public StyleSheetList getStyleSheets();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/LinkStyle.java b/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/LinkStyle.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/LinkStyle.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/LinkStyle.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/LinkStyle.java
@@ -582114,7 +582114,7 @@
 +    public StyleSheet getSheet();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/MediaList.java b/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/MediaList.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/MediaList.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/MediaList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/MediaList.java
@@ -582233,7 +582233,7 @@
 +                             throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/StyleSheet.java b/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/StyleSheet.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/StyleSheet.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/StyleSheet.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/StyleSheet.java
@@ -582370,7 +582370,7 @@
 +    public MediaList getMedia();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/StyleSheetList.java b/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/StyleSheetList.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/StyleSheetList.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/StyleSheetList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/stylesheets/StyleSheetList.java
@@ -582446,7 +582446,7 @@
 +    public StyleSheet item(int index);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/traversal/DocumentTraversal.java b/drop_included/jaxp_src/src/org/w3c/dom/traversal/DocumentTraversal.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/traversal/DocumentTraversal.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/traversal/DocumentTraversal.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/traversal/DocumentTraversal.java
@@ -582573,7 +582573,7 @@
 +                                       throws DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/traversal/NodeFilter.java b/drop_included/jaxp_src/src/org/w3c/dom/traversal/NodeFilter.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/traversal/NodeFilter.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/traversal/NodeFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/traversal/NodeFilter.java
@@ -582751,7 +582751,7 @@
 +    public short acceptNode(Node n);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/traversal/NodeIterator.java b/drop_included/jaxp_src/src/org/w3c/dom/traversal/NodeIterator.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/traversal/NodeIterator.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/traversal/NodeIterator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/traversal/NodeIterator.java
@@ -582894,7 +582894,7 @@
 +    public void detach();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/traversal/TreeWalker.java b/drop_included/jaxp_src/src/org/w3c/dom/traversal/TreeWalker.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/traversal/TreeWalker.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/traversal/TreeWalker.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/traversal/TreeWalker.java
@@ -583107,7 +583107,7 @@
 +    public Node nextNode();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/views/AbstractView.java b/drop_included/jaxp_src/src/org/w3c/dom/views/AbstractView.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/views/AbstractView.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/views/AbstractView.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/views/AbstractView.java
@@ -583168,7 +583168,7 @@
 +    public DocumentView getDocument();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/views/DocumentView.java b/drop_included/jaxp_src/src/org/w3c/dom/views/DocumentView.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/views/DocumentView.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/views/DocumentView.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/views/DocumentView.java
@@ -583232,7 +583232,7 @@
 +    public AbstractView getDefaultView();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/xpath/COPYRIGHT.html b/drop_included/jaxp_src/src/org/w3c/dom/xpath/COPYRIGHT.html
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/xpath/COPYRIGHT.html openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/xpath/COPYRIGHT.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/xpath/COPYRIGHT.html
@@ -583343,7 +583343,7 @@
 +    </p>
 +  </body>
 +</html>
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathEvaluator.java b/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathEvaluator.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathEvaluator.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathEvaluator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathEvaluator.java
@@ -583510,7 +583510,7 @@
 +                           throws XPathException, DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathException.java b/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathException.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathException.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathException.java
@@ -583583,7 +583583,7 @@
 +    public static final short TYPE_ERR                  = 2;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathExpression.java b/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathExpression.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathExpression.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathExpression.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathExpression.java
@@ -583683,7 +583683,7 @@
 +                           throws XPathException, DOMException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathNSResolver.java b/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathNSResolver.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathNSResolver.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathNSResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathNSResolver.java
@@ -583752,7 +583752,7 @@
 +    public String lookupNamespaceURI(String prefix);
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathNamespace.java b/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathNamespace.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathNamespace.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathNamespace.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathNamespace.java
@@ -583851,7 +583851,7 @@
 +    public Element getOwnerElement();
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathResult.java b/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathResult.java
+diff --git a/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathResult.java openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathResult.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/w3c/dom/xpath/XPathResult.java
@@ -584097,7 +584097,7 @@
 +                             throws XPathException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/AttributeList.java b/drop_included/jaxp_src/src/org/xml/sax/AttributeList.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/AttributeList.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/AttributeList.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/AttributeList.java
@@ -584319,7 +584319,7 @@
 +}
 +
 +// end of AttributeList.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/Attributes.java b/drop_included/jaxp_src/src/org/xml/sax/Attributes.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/Attributes.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/Attributes.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/Attributes.java
@@ -584605,7 +584605,7 @@
 +}
 +
 +// end of Attributes.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/COPYING b/drop_included/jaxp_src/src/org/xml/sax/COPYING
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/COPYING openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/COPYING
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/COPYING
@@ -584622,7 +584622,7 @@
 +David Megginson
 +david@megginson.com
 +2000-01-14
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/COPYING.txt b/drop_included/jaxp_src/src/org/xml/sax/COPYING.txt
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/COPYING.txt openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/COPYING.txt
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/COPYING.txt
@@ -584666,7 +584666,7 @@
 +David Megginson <sax@megginson.com>
 +1998-05-11
 +
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/ContentHandler.java b/drop_included/jaxp_src/src/org/xml/sax/ContentHandler.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/ContentHandler.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ContentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ContentHandler.java
@@ -585114,7 +585114,7 @@
 +}
 +
 +// end of ContentHandler.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/DTDHandler.java b/drop_included/jaxp_src/src/org/xml/sax/DTDHandler.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/DTDHandler.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/DTDHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/DTDHandler.java
@@ -585260,7 +585260,7 @@
 +}
 +
 +// end of DTDHandler.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/DocumentHandler.java b/drop_included/jaxp_src/src/org/xml/sax/DocumentHandler.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/DocumentHandler.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/DocumentHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/DocumentHandler.java
@@ -585521,7 +585521,7 @@
 +}
 +
 +// end of DocumentHandler.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/EntityResolver.java b/drop_included/jaxp_src/src/org/xml/sax/EntityResolver.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/EntityResolver.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/EntityResolver.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/EntityResolver.java
@@ -585669,7 +585669,7 @@
 +}
 +
 +// end of EntityResolver.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/ErrorHandler.java b/drop_included/jaxp_src/src/org/xml/sax/ErrorHandler.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/ErrorHandler.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ErrorHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ErrorHandler.java
@@ -585837,7 +585837,7 @@
 +}
 +
 +// end of ErrorHandler.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/HandlerBase.java b/drop_included/jaxp_src/src/org/xml/sax/HandlerBase.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/HandlerBase.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/HandlerBase.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/HandlerBase.java
@@ -586235,7 +586235,7 @@
 +}
 +
 +// end of HandlerBase.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/InputSource.java b/drop_included/jaxp_src/src/org/xml/sax/InputSource.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/InputSource.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/InputSource.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/InputSource.java
@@ -586600,7 +586600,7 @@
 +}
 +
 +// end of InputSource.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/Locator.java b/drop_included/jaxp_src/src/org/xml/sax/Locator.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/Locator.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/Locator.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/Locator.java
@@ -586765,7 +586765,7 @@
 +}
 +
 +// end of Locator.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/Parser.java b/drop_included/jaxp_src/src/org/xml/sax/Parser.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/Parser.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/Parser.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/Parser.java
@@ -587003,7 +587003,7 @@
 +}
 +
 +// end of Parser.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/SAXException.java b/drop_included/jaxp_src/src/org/xml/sax/SAXException.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/SAXException.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/SAXException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/SAXException.java
@@ -587196,7 +587196,7 @@
 +}
 +
 +// end of SAXException.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/SAXNotRecognizedException.java b/drop_included/jaxp_src/src/org/xml/sax/SAXNotRecognizedException.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/SAXNotRecognizedException.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/SAXNotRecognizedException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/SAXNotRecognizedException.java
@@ -587280,7 +587280,7 @@
 +}
 +
 +// end of SAXNotRecognizedException.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/SAXNotSupportedException.java b/drop_included/jaxp_src/src/org/xml/sax/SAXNotSupportedException.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/SAXNotSupportedException.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/SAXNotSupportedException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/SAXNotSupportedException.java
@@ -587364,7 +587364,7 @@
 +}
 +
 +// end of SAXNotSupportedException.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/SAXParseException.java b/drop_included/jaxp_src/src/org/xml/sax/SAXParseException.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/SAXParseException.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/SAXParseException.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/SAXParseException.java
@@ -587682,7 +587682,7 @@
 +}
 +
 +// end of SAXParseException.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/XMLFilter.java b/drop_included/jaxp_src/src/org/xml/sax/XMLFilter.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/XMLFilter.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/XMLFilter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/XMLFilter.java
@@ -587776,7 +587776,7 @@
 +}
 +
 +// end of XMLFilter.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/XMLReader.java b/drop_included/jaxp_src/src/org/xml/sax/XMLReader.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/XMLReader.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/XMLReader.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/XMLReader.java
@@ -588209,7 +588209,7 @@
 +        throws IOException, SAXException;
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/Attributes2.java b/drop_included/jaxp_src/src/org/xml/sax/ext/Attributes2.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/Attributes2.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/Attributes2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/Attributes2.java
@@ -588370,7 +588370,7 @@
 +     */
 +    public boolean isSpecified (String qName);
 +}
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/Attributes2Impl.java b/drop_included/jaxp_src/src/org/xml/sax/ext/Attributes2Impl.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/Attributes2Impl.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/Attributes2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/Attributes2Impl.java
@@ -588707,7 +588707,7 @@
 +        specified [index] = value;
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/DeclHandler.java b/drop_included/jaxp_src/src/org/xml/sax/ext/DeclHandler.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/DeclHandler.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/DeclHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/DeclHandler.java
@@ -588882,7 +588882,7 @@
 +}
 +
 +// end of DeclHandler.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/DefaultHandler2.java b/drop_included/jaxp_src/src/org/xml/sax/ext/DefaultHandler2.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/DefaultHandler2.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/DefaultHandler2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/DefaultHandler2.java
@@ -589041,7 +589041,7 @@
 +    throws SAXException, IOException
 +        { return resolveEntity (null, publicId, null, systemId); }
 +}
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/EntityResolver2.java b/drop_included/jaxp_src/src/org/xml/sax/ext/EntityResolver2.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/EntityResolver2.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/EntityResolver2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/EntityResolver2.java
@@ -589267,7 +589267,7 @@
 +            String systemId
 +    ) throws SAXException, IOException;
 +}
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/LexicalHandler.java b/drop_included/jaxp_src/src/org/xml/sax/ext/LexicalHandler.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/LexicalHandler.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/LexicalHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/LexicalHandler.java
@@ -589508,7 +589508,7 @@
 +}
 +
 +// end of LexicalHandler.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/Locator2.java b/drop_included/jaxp_src/src/org/xml/sax/ext/Locator2.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/Locator2.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/Locator2.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/Locator2.java
@@ -589612,7 +589612,7 @@
 +     */
 +    public String getEncoding ();
 +}
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/Locator2Impl.java b/drop_included/jaxp_src/src/org/xml/sax/ext/Locator2Impl.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/Locator2Impl.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/Locator2Impl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/Locator2Impl.java
@@ -589742,7 +589742,7 @@
 +    public void setEncoding (String encoding)
 +        { this.encoding = encoding; }
 +}
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/package.html b/drop_included/jaxp_src/src/org/xml/sax/ext/package.html
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/ext/package.html openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/ext/package.html
@@ -589793,7 +589793,7 @@
 +of parsers supporting the standardized SAX2 interfaces.  </p>
 +
 +</BODY></HTML>
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/AttributeListImpl.java b/drop_included/jaxp_src/src/org/xml/sax/helpers/AttributeListImpl.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/AttributeListImpl.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/AttributeListImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/AttributeListImpl.java
@@ -590134,7 +590134,7 @@
 +}
 +
 +// end of AttributeListImpl.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/AttributesImpl.java b/drop_included/jaxp_src/src/org/xml/sax/helpers/AttributesImpl.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/AttributesImpl.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/AttributesImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/AttributesImpl.java
@@ -590780,7 +590780,7 @@
 +}
 +
 +// end of AttributesImpl.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/DefaultHandler.java b/drop_included/jaxp_src/src/org/xml/sax/helpers/DefaultHandler.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/DefaultHandler.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/DefaultHandler.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/DefaultHandler.java
@@ -591276,7 +591276,7 @@
 +}
 +
 +// end of DefaultHandler.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/LocatorImpl.java b/drop_included/jaxp_src/src/org/xml/sax/helpers/LocatorImpl.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/LocatorImpl.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/LocatorImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/LocatorImpl.java
@@ -591519,7 +591519,7 @@
 +}
 +
 +// end of LocatorImpl.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/NamespaceSupport.java b/drop_included/jaxp_src/src/org/xml/sax/helpers/NamespaceSupport.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/NamespaceSupport.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/NamespaceSupport.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/NamespaceSupport.java
@@ -592372,7 +592372,7 @@
 +}
 +
 +// end of NamespaceSupport.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/NewInstance.java b/drop_included/jaxp_src/src/org/xml/sax/helpers/NewInstance.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/NewInstance.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/NewInstance.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/NewInstance.java
@@ -592480,7 +592480,7 @@
 +        }
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/ParserAdapter.java b/drop_included/jaxp_src/src/org/xml/sax/helpers/ParserAdapter.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/ParserAdapter.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/ParserAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/ParserAdapter.java
@@ -593555,7 +593555,7 @@
 +}
 +
 +// end of ParserAdapter.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/ParserFactory.java b/drop_included/jaxp_src/src/org/xml/sax/helpers/ParserFactory.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/ParserFactory.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/ParserFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/ParserFactory.java
@@ -593712,7 +593712,7 @@
 +    }
 +
 +}
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLFilterImpl.java b/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLFilterImpl.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLFilterImpl.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLFilterImpl.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLFilterImpl.java
@@ -594454,7 +594454,7 @@
 +}
 +
 +// end of XMLFilterImpl.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLReaderAdapter.java b/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLReaderAdapter.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLReaderAdapter.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLReaderAdapter.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLReaderAdapter.java
@@ -595021,7 +595021,7 @@
 +}
 +
 +// end of XMLReaderAdapter.java
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLReaderFactory.java b/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLReaderFactory.java
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLReaderFactory.java openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLReaderFactory.java
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/XMLReaderFactory.java
@@ -595269,7 +595269,7 @@
 +	}
 +    }
 +}
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/package.html b/drop_included/jaxp_src/src/org/xml/sax/helpers/package.html
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/helpers/package.html openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/helpers/package.html
@@ -595285,7 +595285,7 @@
 +for more information about SAX.</p>
 +
 +</BODY></HTML>
-diff --git a/drop_included/jaxp_src/src/org/xml/sax/package.html b/drop_included/jaxp_src/src/org/xml/sax/package.html
+diff --git a/drop_included/jaxp_src/src/org/xml/sax/package.html openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/package.html
 new file mode 100644
 --- /dev/null
 +++ openjdk/jaxp/drop_included/jaxp_src/src/org/xml/sax/package.html